diff --git a/modules/opendeals_custom/opendeals_module/opendeals_module.js b/modules/opendeals_custom/opendeals_module/opendeals_module.js
index 9b0628c..86e17fd 100644
--- a/modules/opendeals_custom/opendeals_module/opendeals_module.js
+++ b/modules/opendeals_custom/opendeals_module/opendeals_module.js
@@ -2,15 +2,14 @@
   $(document).ready(function(){
 	deals_city = $.cookie('deals_city');
 	if(deals_city!='' && deals_city!=null){
-		parts = deals_city.split('::');
-		deals_city = parts[1];
-		deals_city = escape(deals_city);
+		deals_city = '/all-deals/'+deals_city;
 		$('.view-cities-list select option').removeAttr('selected');
-    $('.view-cities-list select option[value*="'+deals_city+'"]').attr('selected','selected');
+    $('.view-cities-list select option[value$="'+deals_city+'"]').attr('selected','selected');
 	}
 
 	$('.view-cities-list select').unbind().bind('change', function(){
-		customvalue = unescape(this.value);
+		parts = (this.value).split('::');
+		customvalue = parts[1].replace('/all-deals/', '');
 	  $.cookie('deals_city', customvalue, { expires: 30, path: Drupal.settings.basePath});
 	  window.location.reload();
 	  return false;
diff --git a/modules/opendeals_custom/opendeals_module/opendeals_module.module b/modules/opendeals_custom/opendeals_module/opendeals_module.module
index e096831..603d725 100644
--- a/modules/opendeals_custom/opendeals_module/opendeals_module.module
+++ b/modules/opendeals_custom/opendeals_module/opendeals_module.module
@@ -65,7 +65,7 @@ function opendeals_module_boot() {
     ->execute();
   $terms = array();
   while($record = $result->fetchAssoc()) {
-    $terms[$record['name']] = $record['tid'];
+    $terms[$record['tid']] = $record['name'];
   }
 
   // some global stuff
@@ -76,16 +76,13 @@ function opendeals_module_boot() {
 
   // if city is defined in cookie we move it in url to handle caching
   if (isset($_COOKIE['deals_city'])) {
-    $current_city = array_pop(explode('/', $_COOKIE['deals_city']));
+    $current_city = trim($_COOKIE['deals_city']);
 
     // if no exists
     if (!array_key_exists($current_city, $terms)) {
       $current_city = '';
       setcookie('deals_city', $current_city, time() - 365 * 24 * 60 * 60, $base_path);
     }
-    else{
-      $current_city = $terms[$current_city];
-    }
 
     // prevent infinite loops
     if(isset($_GET['deals_city']) and $current_city == $_GET['deals_city']){
@@ -107,10 +104,10 @@ function opendeals_module_boot() {
       }
     }
     $_GET['deals_city'] = $current_city;
-    
+
     // The next step is to serve cache for the new url or continue with the
     // uncached content if needed
-    
+
     // Check for a cache mode force from settings.php.
     if (variable_get('page_cache_without_database')) {
       $cache_enabled = TRUE;
diff --git a/modules/opendeals_features/opendeals_views/opendeals_views.features.inc b/modules/opendeals_features/opendeals_views/opendeals_views.features.inc
index 500c21b..ecf7166 100644
--- a/modules/opendeals_features/opendeals_views/opendeals_views.features.inc
+++ b/modules/opendeals_features/opendeals_views/opendeals_views.features.inc
@@ -8,8 +8,5 @@
  * Implements hook_views_api().
  */
 function opendeals_views_views_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "views" && $api == "views_default") {
-    return array("version" => "3.0");
-  }
+  return array("version" => "3.0");
 }
diff --git a/modules/opendeals_features/opendeals_views/opendeals_views.info b/modules/opendeals_features/opendeals_views/opendeals_views.info
index d7a9aeb..ec32e9a 100644
--- a/modules/opendeals_features/opendeals_views/opendeals_views.info
+++ b/modules/opendeals_features/opendeals_views/opendeals_views.info
@@ -1,14 +1,16 @@
-core = "7.x"
-dependencies[] = "opendeals_content_types"
-dependencies[] = "opendeals_defaults"
-dependencies[] = "views"
-description = "create opendeals views"
-features[ctools][] = "views:views_default:3.0"
-features[views_view][] = "all_deals"
-features[views_view][] = "cities_list"
-features[views_view][] = "deals_management"
-features[views_view][] = "frontpage"
-name = "Opendeals Views"
-package = "Features"
-php = "5.2.4"
-project = "opendeals_views"
\ No newline at end of file
+name = Opendeals Views
+description = create opendeals views
+core = 7.x
+package = Features
+php = 5.2.4
+project = opendeals
+dependencies[] = opendeals_content_types
+dependencies[] = opendeals_defaults
+dependencies[] = views
+datestamp = 1347454318
+features[ctools][] = views:views_default:3.0
+features[features_api][] = api:1
+features[views_view][] = all_deals
+features[views_view][] = cities_list
+features[views_view][] = deals_management
+features[views_view][] = frontpage
diff --git a/modules/opendeals_features/opendeals_views/opendeals_views.views_default.inc b/modules/opendeals_features/opendeals_views/opendeals_views.views_default.inc
index 7fb4da6..74c818c 100644
--- a/modules/opendeals_features/opendeals_views/opendeals_views.views_default.inc
+++ b/modules/opendeals_features/opendeals_views/opendeals_views.views_default.inc
@@ -10,20 +10,21 @@
 function opendeals_views_views_default_views() {
   $export = array();
 
-  $view = new view;
+  $view = new view();
   $view->name = 'all_deals';
   $view->description = '';
   $view->tag = 'default';
   $view->base_table = 'node';
   $view->human_name = 'All Deals';
   $view->core = 7;
-  $view->api_version = '3.0-alpha1';
+  $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'All Deals';
   $handler->display->display_options['css_class'] = 'boxExtraDealMulti sidebarBoxMain';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
@@ -39,12 +40,10 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['header']['view']['id'] = 'view';
   $handler->display->display_options['header']['view']['table'] = 'views';
   $handler->display->display_options['header']['view']['field'] = 'view';
-  $handler->display->display_options['header']['view']['empty'] = FALSE;
   /* No results behavior: Global: Text area */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   /* Relationship: Content: Referenced product */
   $handler->display->display_options['relationships']['field_product_product_id']['id'] = 'field_product_product_id';
   $handler->display->display_options['relationships']['field_product_product_id']['table'] = 'field_data_field_product';
@@ -53,75 +52,33 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['relationships']['field_city_tid']['id'] = 'field_city_tid';
   $handler->display->display_options['relationships']['field_city_tid']['table'] = 'field_data_field_city';
   $handler->display->display_options['relationships']['field_city_tid']['field'] = 'field_city_tid';
-  $handler->display->display_options['relationships']['field_city_tid']['required'] = 1;
+  $handler->display->display_options['relationships']['field_city_tid']['required'] = TRUE;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
   $handler->display->display_options['fields']['nid']['table'] = 'node';
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: Image */
   $handler->display->display_options['fields']['field_deal_image']['id'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['table'] = 'field_data_field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['field'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['relationship'] = 'field_product_product_id';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_deal_image']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_deal_image']['settings'] = array(
     'image_style' => '',
     'image_link' => '',
   );
-  $handler->display->display_options['fields']['field_deal_image']['field_api_classes'] = 0;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -137,12 +94,9 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['arguments']['tid']['field'] = 'tid';
   $handler->display->display_options['arguments']['tid']['relationship'] = 'field_city_tid';
   $handler->display->display_options['arguments']['tid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['tid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['tid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['tid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['tid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['tid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['tid']['not'] = 0;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -168,6 +122,7 @@ function opendeals_views_views_default_views() {
   /* Display: All Deals */
   $handler = $view->new_display('page', 'All Deals', 'page');
   $handler->display->display_options['defaults']['css_class'] = FALSE;
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['query'] = FALSE;
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['query']['options']['distinct'] = TRUE;
@@ -177,36 +132,31 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['pager']['options']['items_per_page'] = '12';
   $handler->display->display_options['pager']['options']['offset'] = '1';
   $handler->display->display_options['pager']['options']['id'] = '0';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;
   $handler->display->display_options['defaults']['style_plugin'] = FALSE;
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['style_options']['row_class'] = 'three_up';
   $handler->display->display_options['defaults']['style_options'] = FALSE;
   $handler->display->display_options['defaults']['row_plugin'] = FALSE;
   $handler->display->display_options['row_plugin'] = 'fields';
-  $handler->display->display_options['row_options']['hide_empty'] = 0;
-  $handler->display->display_options['row_options']['default_field_elements'] = 1;
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: View area */
   $handler->display->display_options['header']['view']['id'] = 'view';
   $handler->display->display_options['header']['view']['table'] = 'views';
   $handler->display->display_options['header']['view']['field'] = 'view';
-  $handler->display->display_options['header']['view']['empty'] = FALSE;
   $handler->display->display_options['header']['view']['view_to_insert'] = 'all_deals:block_1';
-  $handler->display->display_options['header']['view']['inherit_arguments'] = 1;
+  $handler->display->display_options['header']['view']['inherit_arguments'] = TRUE;
   $handler->display->display_options['defaults']['empty'] = FALSE;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
   /* Relationship: Content: Referenced product */
   $handler->display->display_options['relationships']['field_product_product_id']['id'] = 'field_product_product_id';
   $handler->display->display_options['relationships']['field_product_product_id']['table'] = 'field_data_field_product';
   $handler->display->display_options['relationships']['field_product_product_id']['field'] = 'field_product_product_id';
-  $handler->display->display_options['relationships']['field_product_product_id']['required'] = 0;
   /* Relationship: Content: Available at (field_city) */
   $handler->display->display_options['relationships']['field_city_tid']['id'] = 'field_city_tid';
   $handler->display->display_options['relationships']['field_city_tid']['table'] = 'field_data_field_city';
   $handler->display->display_options['relationships']['field_city_tid']['field'] = 'field_city_tid';
-  $handler->display->display_options['relationships']['field_city_tid']['required'] = 1;
+  $handler->display->display_options['relationships']['field_city_tid']['required'] = TRUE;
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
@@ -214,49 +164,19 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
   $handler->display->display_options['fields']['title']['alter']['max_length'] = '30';
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 1;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = TRUE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: Image */
   $handler->display->display_options['fields']['field_deal_image']['id'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['table'] = 'field_data_field_deal_image';
@@ -264,29 +184,13 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['field_deal_image']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_deal_image']['label'] = '';
   $handler->display->display_options['fields']['field_deal_image']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_deal_image']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_deal_image']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_deal_image']['settings'] = array(
     'image_style' => '268x160_upscale',
     'image_link' => '',
   );
-  $handler->display->display_options['fields']['field_deal_image']['field_api_classes'] = 0;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -311,28 +215,14 @@ function opendeals_views_views_default_views() {
     </div>
   </div>
 </div>';
-  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nothing']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = 0;
   $handler->display->display_options['path'] = 'all-deals';
 
   /* Display: Block */
   $handler = $view->new_display('block', 'Block', 'block');
   $handler->display->display_options['defaults']['use_ajax'] = FALSE;
   $handler->display->display_options['use_ajax'] = TRUE;
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['query'] = FALSE;
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['query']['options']['distinct'] = TRUE;
@@ -353,10 +243,8 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['header']['area']['id'] = 'area';
   $handler->display->display_options['header']['area']['table'] = 'views';
   $handler->display->display_options['header']['area']['field'] = 'area';
-  $handler->display->display_options['header']['area']['empty'] = FALSE;
   $handler->display->display_options['header']['area']['content'] = '<div class="sidebarheader">More Great Deals <a href="all-deals">See all</a></div>';
   $handler->display->display_options['header']['area']['format'] = 'full_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['footer'] = FALSE;
   $handler->display->display_options['defaults']['empty'] = FALSE;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
@@ -368,7 +256,6 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['relationships']['field_city_tid']['id'] = 'field_city_tid';
   $handler->display->display_options['relationships']['field_city_tid']['table'] = 'field_data_field_city';
   $handler->display->display_options['relationships']['field_city_tid']['field'] = 'field_city_tid';
-  $handler->display->display_options['relationships']['field_city_tid']['required'] = 0;
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
@@ -376,195 +263,93 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_class'] = 'extradescription';
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: Price */
   $handler->display->display_options['fields']['commerce_price']['id'] = 'commerce_price';
   $handler->display->display_options['fields']['commerce_price']['table'] = 'field_data_commerce_price';
   $handler->display->display_options['fields']['commerce_price']['field'] = 'commerce_price';
   $handler->display->display_options['fields']['commerce_price']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['commerce_price']['label'] = '';
-  $handler->display->display_options['fields']['commerce_price']['alter']['alter_text'] = 1;
+  $handler->display->display_options['fields']['commerce_price']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['commerce_price']['alter']['text'] = '<span class="priceIcon"></span>[commerce_price]';
-  $handler->display->display_options['fields']['commerce_price']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['commerce_price']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['commerce_price']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['commerce_price']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['commerce_price']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['commerce_price']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['alter']['html'] = 0;
   $handler->display->display_options['fields']['commerce_price']['element_type'] = 'div';
   $handler->display->display_options['fields']['commerce_price']['element_class'] = 'price';
   $handler->display->display_options['fields']['commerce_price']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['commerce_price']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['commerce_price']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['commerce_price']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['commerce_price']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['commerce_price']['click_sort_column'] = 'amount';
   $handler->display->display_options['fields']['commerce_price']['type'] = 'opendeals_formatted_amount';
   $handler->display->display_options['fields']['commerce_price']['settings'] = array(
     'calculation' => '0',
   );
-  $handler->display->display_options['fields']['commerce_price']['field_api_classes'] = 0;
   /* Field: Commerce Product: Original Price */
   $handler->display->display_options['fields']['field_or_price']['id'] = 'field_or_price';
   $handler->display->display_options['fields']['field_or_price']['table'] = 'field_data_field_or_price';
   $handler->display->display_options['fields']['field_or_price']['field'] = 'field_or_price';
   $handler->display->display_options['fields']['field_or_price']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_or_price']['label'] = '';
-  $handler->display->display_options['fields']['field_or_price']['alter']['alter_text'] = 1;
+  $handler->display->display_options['fields']['field_or_price']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_or_price']['alter']['text'] = '<span>[field_or_price]</span> value';
-  $handler->display->display_options['fields']['field_or_price']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['field_or_price']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['field_or_price']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['field_or_price']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_or_price']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_or_price']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_or_price']['element_type'] = 'div';
   $handler->display->display_options['fields']['field_or_price']['element_class'] = 'value';
   $handler->display->display_options['fields']['field_or_price']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_or_price']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_or_price']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_or_price']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_or_price']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_or_price']['click_sort_column'] = 'amount';
   $handler->display->display_options['fields']['field_or_price']['type'] = 'opendeals_formatted_amount';
   $handler->display->display_options['fields']['field_or_price']['settings'] = array(
     'calculation' => FALSE,
   );
-  $handler->display->display_options['fields']['field_or_price']['field_api_classes'] = 0;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing_1']['id'] = 'nothing_1';
   $handler->display->display_options['fields']['nothing_1']['table'] = 'views';
   $handler->display->display_options['fields']['nothing_1']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing_1']['label'] = '';
   $handler->display->display_options['fields']['nothing_1']['alter']['text'] = 'View It!';
-  $handler->display->display_options['fields']['nothing_1']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['nothing_1']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['nothing_1']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['nothing_1']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['alter']['trim_whitespace'] = 0;
   $handler->display->display_options['fields']['nothing_1']['alter']['link_class'] = 'buttons buy_btn small';
-  $handler->display->display_options['fields']['nothing_1']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing_1']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing_1']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nothing_1']['element_type'] = 'div';
   $handler->display->display_options['fields']['nothing_1']['element_class'] = 'extraview';
   $handler->display->display_options['fields']['nothing_1']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nothing_1']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing_1']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing_1']['hide_alter_empty'] = 0;
   /* Field: Commerce Product: Image */
   $handler->display->display_options['fields']['field_deal_image']['id'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['table'] = 'field_data_field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['field'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_deal_image']['label'] = '';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['field_deal_image']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['field_deal_image']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim_whitespace'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['alter']['link_class'] = 'jSideDeal';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['element_type'] = 'div';
   $handler->display->display_options['fields']['field_deal_image']['element_class'] = 'extraimage';
   $handler->display->display_options['fields']['field_deal_image']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_deal_image']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_deal_image']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_deal_image']['settings'] = array(
     'image_style' => '124x75_upscale',
     'image_link' => '',
   );
-  $handler->display->display_options['fields']['field_deal_image']['field_api_classes'] = 0;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing_3']['id'] = 'nothing_3';
   $handler->display->display_options['fields']['nothing_3']['table'] = 'views';
   $handler->display->display_options['fields']['nothing_3']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing_3']['label'] = '';
   $handler->display->display_options['fields']['nothing_3']['alter']['text'] = '<div class="wrapper"></div>';
-  $handler->display->display_options['fields']['nothing_3']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing_3']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing_3']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nothing_3']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nothing_3']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing_3']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing_3']['hide_alter_empty'] = 0;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Taxonomy term: Term ID */
   $handler->display->display_options['arguments']['tid']['id'] = 'tid';
@@ -572,16 +357,14 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['arguments']['tid']['field'] = 'tid';
   $handler->display->display_options['arguments']['tid']['relationship'] = 'field_city_tid';
   $handler->display->display_options['arguments']['tid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['tid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['tid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['tid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['tid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['tid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['tid']['not'] = 0;
 
   /* Display: First item from all-deals Block */
   $handler = $view->new_display('block', 'First item from all-deals Block', 'block_1');
   $handler->display->display_options['defaults']['css_class'] = FALSE;
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['style_plugin'] = FALSE;
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['style_options']['row_class'] = 'one-up';
@@ -594,10 +377,8 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no deals in this category.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
@@ -605,24 +386,8 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: Image */
   $handler->display->display_options['fields']['field_deal_image']['id'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['table'] = 'field_data_field_deal_image';
@@ -630,57 +395,27 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['field_deal_image']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_deal_image']['label'] = '';
   $handler->display->display_options['fields']['field_deal_image']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['alter']['text'] = '[field_deal_image]';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_deal_image']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_deal_image']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_deal_image']['settings'] = array(
     'image_style' => '',
     'image_link' => '',
   );
-  $handler->display->display_options['fields']['field_deal_image']['field_api_classes'] = 0;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['title']['alter']['text'] = '[title]';
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['title']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: A few words */
   $handler->display->display_options['fields']['field_few_words']['id'] = 'field_few_words';
   $handler->display->display_options['fields']['field_few_words']['table'] = 'field_data_field_few_words';
@@ -688,24 +423,8 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['field_few_words']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_few_words']['label'] = '';
   $handler->display->display_options['fields']['field_few_words']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_few_words']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_few_words']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_few_words']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_few_words']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_few_words']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_few_words']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_few_words']['hide_alter_empty'] = FALSE;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -729,22 +448,7 @@ function opendeals_views_views_default_views() {
     <div class="line"></div>
   </div>
 </div>';
-  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nothing']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = 0;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Taxonomy term: Term ID */
   $handler->display->display_options['arguments']['tid']['id'] = 'tid';
@@ -752,52 +456,45 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['arguments']['tid']['field'] = 'tid';
   $handler->display->display_options['arguments']['tid']['relationship'] = 'field_city_tid';
   $handler->display->display_options['arguments']['tid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['tid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['tid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['tid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['tid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['tid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['tid']['not'] = 0;
   $handler->display->display_options['block_description'] = 'First item from all-deals';
 
   /* Display: Past Deals */
   $handler = $view->new_display('page', 'Past Deals', 'page_2');
   $handler->display->display_options['defaults']['css_class'] = FALSE;
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['pager'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '12';
   $handler->display->display_options['pager']['options']['offset'] = '1';
   $handler->display->display_options['pager']['options']['id'] = '0';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;
   $handler->display->display_options['defaults']['style_plugin'] = FALSE;
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['style_options']['row_class'] = 'three_up';
   $handler->display->display_options['defaults']['style_options'] = FALSE;
   $handler->display->display_options['defaults']['row_plugin'] = FALSE;
   $handler->display->display_options['row_plugin'] = 'fields';
-  $handler->display->display_options['row_options']['hide_empty'] = 0;
-  $handler->display->display_options['row_options']['default_field_elements'] = 1;
   $handler->display->display_options['defaults']['row_options'] = FALSE;
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: View area */
   $handler->display->display_options['header']['view']['id'] = 'view';
   $handler->display->display_options['header']['view']['table'] = 'views';
   $handler->display->display_options['header']['view']['field'] = 'view';
-  $handler->display->display_options['header']['view']['empty'] = FALSE;
   $handler->display->display_options['header']['view']['view_to_insert'] = 'all_deals:block_3';
-  $handler->display->display_options['header']['view']['inherit_arguments'] = 1;
+  $handler->display->display_options['header']['view']['inherit_arguments'] = TRUE;
   $handler->display->display_options['defaults']['empty'] = FALSE;
   $handler->display->display_options['defaults']['relationships'] = FALSE;
   /* Relationship: Content: Referenced product */
   $handler->display->display_options['relationships']['field_product_product_id']['id'] = 'field_product_product_id';
   $handler->display->display_options['relationships']['field_product_product_id']['table'] = 'field_data_field_product';
   $handler->display->display_options['relationships']['field_product_product_id']['field'] = 'field_product_product_id';
-  $handler->display->display_options['relationships']['field_product_product_id']['required'] = 0;
   /* Relationship: Content: Available at (field_city) */
   $handler->display->display_options['relationships']['field_city_tid']['id'] = 'field_city_tid';
   $handler->display->display_options['relationships']['field_city_tid']['table'] = 'field_data_field_city';
   $handler->display->display_options['relationships']['field_city_tid']['field'] = 'field_city_tid';
-  $handler->display->display_options['relationships']['field_city_tid']['required'] = 1;
+  $handler->display->display_options['relationships']['field_city_tid']['required'] = TRUE;
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
@@ -805,49 +502,19 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
   $handler->display->display_options['fields']['title']['alter']['max_length'] = '30';
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 1;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = TRUE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: Image */
   $handler->display->display_options['fields']['field_deal_image']['id'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['table'] = 'field_data_field_deal_image';
@@ -855,29 +522,13 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['field_deal_image']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_deal_image']['label'] = '';
   $handler->display->display_options['fields']['field_deal_image']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_deal_image']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_deal_image']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_deal_image']['settings'] = array(
     'image_style' => '268x160_upscale',
     'image_link' => '',
   );
-  $handler->display->display_options['fields']['field_deal_image']['field_api_classes'] = 0;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -902,22 +553,7 @@ function opendeals_views_views_default_views() {
     </div>
   </div>
 </div>';
-  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nothing']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = 0;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Taxonomy term: Term ID */
   $handler->display->display_options['arguments']['tid']['id'] = 'tid';
@@ -925,12 +561,10 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['arguments']['tid']['field'] = 'tid';
   $handler->display->display_options['arguments']['tid']['relationship'] = 'field_city_tid';
   $handler->display->display_options['arguments']['tid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['tid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['tid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['tid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['tid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['tid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['tid']['not'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -960,6 +594,7 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Past Deals';
   $handler->display->display_options['defaults']['css_class'] = FALSE;
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['style_plugin'] = FALSE;
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['style_options']['row_class'] = 'one-up';
@@ -972,10 +607,8 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no deals in this category.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  $handler->display->display_options['empty']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
@@ -983,24 +616,8 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: Image */
   $handler->display->display_options['fields']['field_deal_image']['id'] = 'field_deal_image';
   $handler->display->display_options['fields']['field_deal_image']['table'] = 'field_data_field_deal_image';
@@ -1008,57 +625,27 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['field_deal_image']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_deal_image']['label'] = '';
   $handler->display->display_options['fields']['field_deal_image']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['alter']['text'] = '[field_deal_image]';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['field_deal_image']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_deal_image']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_deal_image']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_deal_image']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_deal_image']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_deal_image']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_deal_image']['settings'] = array(
     'image_style' => '',
     'image_link' => '',
   );
-  $handler->display->display_options['fields']['field_deal_image']['field_api_classes'] = 0;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['label'] = '';
   $handler->display->display_options['fields']['title']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['title']['alter']['text'] = '[title]';
-  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['title']['alter']['path'] = 'node/[nid]';
-  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
   /* Field: Commerce Product: A few words */
   $handler->display->display_options['fields']['field_few_words']['id'] = 'field_few_words';
   $handler->display->display_options['fields']['field_few_words']['table'] = 'field_data_field_few_words';
@@ -1066,24 +653,8 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['fields']['field_few_words']['relationship'] = 'field_product_product_id';
   $handler->display->display_options['fields']['field_few_words']['label'] = '';
   $handler->display->display_options['fields']['field_few_words']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['field_few_words']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_few_words']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_few_words']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['alter']['html'] = 0;
   $handler->display->display_options['fields']['field_few_words']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['field_few_words']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_few_words']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_few_words']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_few_words']['hide_alter_empty'] = FALSE;
   /* Field: Global: Custom text */
   $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
@@ -1107,22 +678,8 @@ function opendeals_views_views_default_views() {
     <div class="line"></div>
   </div>
 </div>';
-  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nothing']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nothing']['alter']['html'] = 0;
   $handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['nothing']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nothing']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nothing']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -1148,20 +705,21 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['block_description'] = 'First item from past-deals';
   $export['all_deals'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'cities_list';
   $view->description = '';
   $view->tag = 'default';
   $view->base_table = 'taxonomy_term_data';
   $view->human_name = 'Cities List';
   $view->core = 7;
-  $view->api_version = '3.0-alpha1';
+  $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Cities List';
   $handler->display->display_options['css_class'] = 'cities-select';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
@@ -1170,67 +728,37 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '';
   $handler->display->display_options['style_plugin'] = 'jump_menu';
-  $handler->display->display_options['style_options']['hide'] = 1;
+  $handler->display->display_options['style_options']['hide'] = TRUE;
   $handler->display->display_options['style_options']['path'] = 'tid';
   $handler->display->display_options['style_options']['choose'] = '- All -';
-  $handler->display->display_options['style_options']['default_value'] = 0;
   $handler->display->display_options['row_plugin'] = 'fields';
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
   $handler->display->display_options['header']['area']['table'] = 'views';
   $handler->display->display_options['header']['area']['field'] = 'area';
-  $handler->display->display_options['header']['area']['empty'] = FALSE;
   $handler->display->display_options['header']['area']['content'] = '<div class="headerCityCaption">Choose City:</div>';
   $handler->display->display_options['header']['area']['format'] = 'full_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
+  /* Field: Taxonomy term: Term ID */
+  $handler->display->display_options['fields']['tid']['id'] = 'tid';
+  $handler->display->display_options['fields']['tid']['table'] = 'taxonomy_term_data';
+  $handler->display->display_options['fields']['tid']['field'] = 'tid';
+  $handler->display->display_options['fields']['tid']['label'] = '';
+  $handler->display->display_options['fields']['tid']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['tid']['alter']['alter_text'] = TRUE;
+  $handler->display->display_options['fields']['tid']['alter']['text'] = 'all-deals/[tid]';
+  $handler->display->display_options['fields']['tid']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['tid']['hide_alter_empty'] = FALSE;
   /* Field: Taxonomy term: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'taxonomy_term_data';
   $handler->display->display_options['fields']['name']['field'] = 'name';
   $handler->display->display_options['fields']['name']['label'] = '';
-  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['make_link'] = 1;
   $handler->display->display_options['fields']['name']['alter']['path'] = 'deals-by-city/[name]';
-  $handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = TRUE;
+  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = FALSE;
+  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['name']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['name']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['name']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['name']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['name']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['name']['link_to_taxonomy'] = 0;
-  /* Field: Taxonomy term: Term ID */
-  $handler->display->display_options['fields']['tid']['id'] = 'tid';
-  $handler->display->display_options['fields']['tid']['table'] = 'taxonomy_term_data';
-  $handler->display->display_options['fields']['tid']['field'] = 'tid';
-  $handler->display->display_options['fields']['tid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['tid']['alter']['alter_text'] = 1;
-  $handler->display->display_options['fields']['tid']['alter']['text'] = 'all-deals/[name]';
-  $handler->display->display_options['fields']['tid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['tid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['tid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['tid']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['tid']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['tid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['tid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['tid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['tid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['tid']['format_plural'] = 0;
+  $handler->display->display_options['fields']['name']['hide_alter_empty'] = FALSE;
   /* Filter criterion: Taxonomy vocabulary: Machine name */
   $handler->display->display_options['filters']['machine_name']['id'] = 'machine_name';
   $handler->display->display_options['filters']['machine_name']['table'] = 'taxonomy_vocabulary';
@@ -1241,22 +769,24 @@ function opendeals_views_views_default_views() {
 
   /* Display: Block */
   $handler = $view->new_display('block', 'Block', 'block');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['block_description'] = 'Cities List';
   $export['cities_list'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'deals_management';
   $view->description = 'This view is the main dashboard for deals management. Intented to be used by site administrators.';
   $view->tag = 'default';
   $view->base_table = 'node';
   $view->human_name = 'Deals Management';
   $view->core = 7;
-  $view->api_version = '3.0-alpha1';
+  $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Deals Management';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'role';
   $handler->display->display_options['access']['role'] = array(
     3 => '3',
@@ -1326,9 +856,6 @@ function opendeals_views_views_default_views() {
       'separator' => '',
     ),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['area']['id'] = 'area';
   $handler->display->display_options['header']['area']['table'] = 'views';
@@ -1357,73 +884,22 @@ function opendeals_views_views_default_views() {
   </tbody>
 </table>';
   $handler->display->display_options['header']['area']['format'] = 'full_html';
-  $handler->display->display_options['header']['area']['tokenize'] = 0;
   /* Field: Content: Nid */
   $handler->display->display_options['fields']['nid']['id'] = 'nid';
   $handler->display->display_options['fields']['nid']['table'] = 'node';
   $handler->display->display_options['fields']['nid']['field'] = 'nid';
   $handler->display->display_options['fields']['nid']['label'] = 'id';
-  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['nid']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['nid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['nid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
+  $handler->display->display_options['fields']['nid']['hide_alter_empty'] = FALSE;
   /* Field: Content: Title */
   $handler->display->display_options['fields']['title_1']['id'] = 'title_1';
   $handler->display->display_options['fields']['title_1']['table'] = 'node';
   $handler->display->display_options['fields']['title_1']['field'] = 'title';
-  $handler->display->display_options['fields']['title_1']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['title_1']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['title_1']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['title_1']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['title_1']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['title_1']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['title_1']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['title_1']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['title_1']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['title_1']['link_to_node'] = 1;
+  $handler->display->display_options['fields']['title_1']['hide_alter_empty'] = FALSE;
   /* Field: Content: Product */
   $handler->display->display_options['fields']['field_product']['id'] = 'field_product';
   $handler->display->display_options['fields']['field_product']['table'] = 'field_data_field_product';
   $handler->display->display_options['fields']['field_product']['field'] = 'field_product';
-  $handler->display->display_options['fields']['field_product']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_product']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_product']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_product']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_product']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_product']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_product']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_product']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_product']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_product']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_product']['type'] = 'commerce_product_reference_sku_link';
   $handler->display->display_options['fields']['field_product']['settings'] = array(
     'show_quantity' => 0,
@@ -1431,98 +907,29 @@ function opendeals_views_views_default_views() {
     'combine' => 1,
     'line_item_type' => 0,
   );
-  $handler->display->display_options['fields']['field_product']['field_api_classes'] = 0;
   /* Field: Content: Published */
   $handler->display->display_options['fields']['status']['id'] = 'status';
   $handler->display->display_options['fields']['status']['table'] = 'node';
   $handler->display->display_options['fields']['status']['field'] = 'status';
-  $handler->display->display_options['fields']['status']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['status']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['status']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['status']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['status']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['status']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['status']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['status']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['status']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['status']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['status']['not'] = 0;
   /* Field: Content: Store */
   $handler->display->display_options['fields']['field_store_refer']['id'] = 'field_store_refer';
   $handler->display->display_options['fields']['field_store_refer']['table'] = 'field_data_field_store_refer';
   $handler->display->display_options['fields']['field_store_refer']['field'] = 'field_store_refer';
-  $handler->display->display_options['fields']['field_store_refer']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_store_refer']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_store_refer']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_store_refer']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['field_store_refer']['hide_alter_empty'] = FALSE;
   /* Field: Content: Available at */
   $handler->display->display_options['fields']['field_city']['id'] = 'field_city';
   $handler->display->display_options['fields']['field_city']['table'] = 'field_data_field_city';
   $handler->display->display_options['fields']['field_city']['field'] = 'field_city';
   $handler->display->display_options['fields']['field_city']['label'] = 'City';
-  $handler->display->display_options['fields']['field_city']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_city']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_city']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_city']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_city']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_city']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_city']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_city']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_city']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['field_city']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_city']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_city']['delta_offset'] = '0';
-  $handler->display->display_options['fields']['field_city']['delta_reversed'] = 0;
-  $handler->display->display_options['fields']['field_city']['field_api_classes'] = 0;
   /* Field: Content: End Date */
   $handler->display->display_options['fields']['field_timending']['id'] = 'field_timending';
   $handler->display->display_options['fields']['field_timending']['table'] = 'field_data_field_timending';
   $handler->display->display_options['fields']['field_timending']['field'] = 'field_timending';
-  $handler->display->display_options['fields']['field_timending']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['field_timending']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['field_timending']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['field_timending']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['field_timending']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['field_timending']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['field_timending']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['field_timending']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['field_timending']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_timending']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['field_timending']['settings'] = array(
     'format_type' => 'short',
     'fromto' => 'both',
@@ -1531,28 +938,11 @@ function opendeals_views_views_default_views() {
     'multiple_to' => '',
     'show_repeat_rule' => 'show',
   );
-  $handler->display->display_options['fields']['field_timending']['field_api_classes'] = 0;
   /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['table'] = 'node';
+  $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['edit_node']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['edit_node']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['edit_node']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['edit_node']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['edit_node']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['edit_node']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = FALSE;
   /* Sort criterion: Content: Post date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'node';
@@ -1576,32 +966,31 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['filters']['field_city_tid']['expose']['label'] = 'City';
   $handler->display->display_options['filters']['field_city_tid']['expose']['operator'] = 'field_city_tid_op';
   $handler->display->display_options['filters']['field_city_tid']['expose']['identifier'] = 'field_city_tid';
-  $handler->display->display_options['filters']['field_city_tid']['expose']['reduce'] = 0;
-  $handler->display->display_options['filters']['field_city_tid']['reduce_duplicates'] = 0;
   $handler->display->display_options['filters']['field_city_tid']['type'] = 'select';
   $handler->display->display_options['filters']['field_city_tid']['vocabulary'] = 'cities';
-  $handler->display->display_options['filters']['field_city_tid']['error_message'] = 1;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['path'] = 'deals-management';
   $handler->display->display_options['menu']['type'] = 'normal';
   $handler->display->display_options['menu']['title'] = 'Deals Management';
   $handler->display->display_options['menu']['name'] = 'management';
   $export['deals_management'] = $view;
 
-  $view = new view;
+  $view = new view();
   $view->name = 'frontpage';
   $view->description = 'Emulates the default Drupal front page; you may set the default home page path to this view to make it your front page.';
   $view->tag = 'default';
   $view->base_table = 'node';
   $view->human_name = 'Front page';
   $view->core = 0;
-  $view->api_version = '3.0-alpha1';
+  $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'none';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
@@ -1613,42 +1002,23 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['style_plugin'] = 'default';
   $handler->display->display_options['row_plugin'] = 'node';
   $handler->display->display_options['row_options']['view_mode'] = 'full';
-  $handler->display->display_options['row_options']['links'] = 0;
-  $handler->display->display_options['row_options']['comments'] = 0;
+  $handler->display->display_options['row_options']['links'] = FALSE;
   /* Relationship: Content: Available at (field_city) */
   $handler->display->display_options['relationships']['field_city_tid']['id'] = 'field_city_tid';
   $handler->display->display_options['relationships']['field_city_tid']['table'] = 'field_data_field_city';
   $handler->display->display_options['relationships']['field_city_tid']['field'] = 'field_city_tid';
-  $handler->display->display_options['relationships']['field_city_tid']['required'] = 1;
+  $handler->display->display_options['relationships']['field_city_tid']['required'] = TRUE;
   /* Relationship: Content: Store (field_store_refer) */
   $handler->display->display_options['relationships']['field_store_refer_nid']['id'] = 'field_store_refer_nid';
   $handler->display->display_options['relationships']['field_store_refer_nid']['table'] = 'field_data_field_store_refer';
   $handler->display->display_options['relationships']['field_store_refer_nid']['field'] = 'field_store_refer_nid';
-  $handler->display->display_options['relationships']['field_store_refer_nid']['required'] = 0;
   $handler->display->display_options['relationships']['field_store_refer_nid']['delta'] = '-1';
   /* Field: Content: Body */
   $handler->display->display_options['fields']['body']['id'] = 'body';
   $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
   $handler->display->display_options['fields']['body']['field'] = 'body';
   $handler->display->display_options['fields']['body']['relationship'] = 'field_product_ref_nid';
-  $handler->display->display_options['fields']['body']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['body']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['body']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['body']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['body']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['body']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['body']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['body']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['body']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['body']['field_api_classes'] = 0;
+  $handler->display->display_options['fields']['body']['hide_alter_empty'] = FALSE;
   /* Sort criterion: Content: Sticky */
   $handler->display->display_options['sorts']['sticky']['id'] = 'sticky';
   $handler->display->display_options['sorts']['sticky']['table'] = 'node';
@@ -1665,12 +1035,9 @@ function opendeals_views_views_default_views() {
   $handler->display->display_options['arguments']['tid']['field'] = 'tid';
   $handler->display->display_options['arguments']['tid']['relationship'] = 'field_city_tid';
   $handler->display->display_options['arguments']['tid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['tid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['tid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['tid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['tid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['tid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['tid']['not'] = 0;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -1695,12 +1062,14 @@ function opendeals_views_views_default_views() {
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['path'] = 'frontpage';
 
   /* Display: Feed */
   $handler = $view->new_display('feed', 'Feed', 'feed');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Front page feed';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'some';
   $handler->display->display_options['style_plugin'] = 'rss';
   $handler->display->display_options['row_plugin'] = 'node_rss';