diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.features_overrides.inc b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.features_overrides.inc
index 233a73cc7d8bfc95da46c413400d4782bbbf09a7..b8ad1c1e30a77aaf23b0bd5a4583b75bd503a747 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.features_overrides.inc
@@ -13,14 +13,36 @@ function ocio_search_features_override_default_overrides() {
 
   // Exported overrides for: search_api_index
   $overrides["search_api_index.database_node_index.options|data_alter_callbacks|search_api_alter_add_viewed_entity|status"] = 0;
+  $overrides["search_api_index.database_node_index.options|fields|search_api_viewed"]["DELETED"] = TRUE;
+  $overrides["search_api_index.node_index.enabled"] = 1;
   $overrides["search_api_index.node_index.options|data_alter_callbacks|search_api_alter_add_url|status"] = 0;
   $overrides["search_api_index.node_index.options|data_alter_callbacks|search_api_alter_add_viewed_entity|status"] = 0;
   $overrides["search_api_index.node_index.options|data_alter_callbacks|search_api_alter_node_access|status"] = 0;
+  $overrides["search_api_index.node_index.options|data_alter_callbacks|search_api_attachments_alter_settings"] = array(
+    'status' => 0,
+    'weight' => 0,
+    'settings' => array(
+      'excluded_extensions' => 'aif art avi bmp gif ico mov oga ogv png psd ra ram rgb flv',
+    ),
+  );
+  $overrides["search_api_index.node_index.options|fields|search_api_access_node"]["DELETED"] = TRUE;
+  $overrides["search_api_index.node_index.options|fields|search_api_url"]["DELETED"] = TRUE;
+  $overrides["search_api_index.node_index.options|fields|search_api_viewed"]["DELETED"] = TRUE;
+  $overrides["search_api_index.node_index.options|processors|search_api_case_ignore|settings|fields|search_api_viewed"]["DELETED"] = TRUE;
   $overrides["search_api_index.node_index.options|processors|search_api_case_ignore|status"] = 0;
+  $overrides["search_api_index.node_index.options|processors|search_api_html_filter|settings|fields|search_api_viewed"]["DELETED"] = TRUE;
+  $overrides["search_api_index.node_index.options|processors|search_api_tokenizer|settings|fields|search_api_viewed"]["DELETED"] = TRUE;
   $overrides["search_api_index.node_index.options|processors|search_api_tokenizer|status"] = 0;
+  $overrides["search_api_index.node_index.options|processors|search_api_transliteration|settings|fields|search_api_viewed"]["DELETED"] = TRUE;
+  $overrides["search_api_index.node_index.server"] = 'solr_server';
+
+  // Exported overrides for: search_api_server
+  $overrides["search_api_server.database_server.options|indexes|database_node_index|search_api_viewed"]["DELETED"] = TRUE;
+  $overrides["search_api_server.solr_server.enabled"] = 1;
 
   // Exported overrides for: views_view
   $overrides["views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|breadcrumb"] = 'test';
+  $overrides["views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|breadcrumb_enable"] = TRUE;
   $overrides["views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|not"] = 0;
   $overrides["views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|title"] = 'Search results for: "%1"';
   $overrides["views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|title_enable"] = TRUE;
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.inc b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.inc
index 54c8d5d30bc9ea30bec104389ec7f14df5b3c3d0..c937cb1ce61b4716eb578a00c2d2de779827144c 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.inc
+++ b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.features.inc
@@ -28,13 +28,42 @@ function ocio_search_ctools_plugin_api($module = NULL, $api = NULL) {
 function ocio_search_default_search_api_index_alter(&$data) {
   if (isset($data['database_node_index'])) {
     $data['database_node_index']->options['data_alter_callbacks']['search_api_alter_add_viewed_entity']['status'] = 0; /* WAS: 1 */
+    unset($data['database_node_index']->options['fields']['search_api_viewed']);
   }
   if (isset($data['node_index'])) {
+    $data['node_index']->enabled = 1; /* WAS: 0 */
     $data['node_index']->options['data_alter_callbacks']['search_api_alter_add_url']['status'] = 0; /* WAS: 1 */
     $data['node_index']->options['data_alter_callbacks']['search_api_alter_add_viewed_entity']['status'] = 0; /* WAS: 1 */
     $data['node_index']->options['data_alter_callbacks']['search_api_alter_node_access']['status'] = 0; /* WAS: 1 */
+    $data['node_index']->options['data_alter_callbacks']['search_api_attachments_alter_settings'] = array(
+      'status' => 0,
+      'weight' => 0,
+      'settings' => array(
+        'excluded_extensions' => 'aif art avi bmp gif ico mov oga ogv png psd ra ram rgb flv',
+      ),
+    ); /* WAS: '' */
     $data['node_index']->options['processors']['search_api_case_ignore']['status'] = 0; /* WAS: 1 */
     $data['node_index']->options['processors']['search_api_tokenizer']['status'] = 0; /* WAS: 1 */
+    $data['node_index']->server = 'solr_server'; /* WAS: '' */
+    unset($data['node_index']->options['fields']['search_api_access_node']);
+    unset($data['node_index']->options['fields']['search_api_url']);
+    unset($data['node_index']->options['fields']['search_api_viewed']);
+    unset($data['node_index']->options['processors']['search_api_case_ignore']['settings']['fields']['search_api_viewed']);
+    unset($data['node_index']->options['processors']['search_api_html_filter']['settings']['fields']['search_api_viewed']);
+    unset($data['node_index']->options['processors']['search_api_tokenizer']['settings']['fields']['search_api_viewed']);
+    unset($data['node_index']->options['processors']['search_api_transliteration']['settings']['fields']['search_api_viewed']);
+  }
+}
+
+/**
+ * Implements hook_default_search_api_server_alter().
+ */
+function ocio_search_default_search_api_server_alter(&$data) {
+  if (isset($data['database_server'])) {
+    unset($data['database_server']->options['indexes']['database_node_index']['search_api_viewed']);
+  }
+  if (isset($data['solr_server'])) {
+    $data['solr_server']->enabled = 1; /* WAS: 0 */
   }
 }
 
@@ -44,6 +73,7 @@ function ocio_search_default_search_api_index_alter(&$data) {
 function ocio_search_views_default_views_alter(&$data) {
   if (isset($data['panopoly_search'])) {
     $data['panopoly_search']->display['default']->display_options['arguments']['search_api_views_fulltext']['breadcrumb'] = 'test'; /* WAS: '' */
+    $data['panopoly_search']->display['default']->display_options['arguments']['search_api_views_fulltext']['breadcrumb_enable'] = TRUE; /* WAS: '' */
     $data['panopoly_search']->display['default']->display_options['arguments']['search_api_views_fulltext']['not'] = 0; /* WAS: '' */
     $data['panopoly_search']->display['default']->display_options['arguments']['search_api_views_fulltext']['title'] = 'Search results for: "%1"'; /* WAS: '' */
     $data['panopoly_search']->display['default']->display_options['arguments']['search_api_views_fulltext']['title_enable'] = TRUE; /* WAS: '' */
diff --git a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.info b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.info
index 6ae896768d3c08799eb0c2b1fbc73426fe7d6638..fcedf98e613f9bc1b1fd8c7c5a122fc3fd47e177 100644
--- a/profiles/wcm_base/modules/custom/ocio_search/ocio_search.info
+++ b/profiles/wcm_base/modules/custom/ocio_search/ocio_search.info
@@ -21,14 +21,29 @@ features[ctools][] = apachesolr_search:apachesolr_search_defaults:3
 features[ctools][] = context:context:3
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
+features[features_override_items][] = search_api_index.node_index
 features[features_override_items][] = views_view.panopoly_search
 features[features_overrides][] = search_api_index.database_node_index.options|data_alter_callbacks|search_api_alter_add_viewed_entity|status
+features[features_overrides][] = search_api_index.database_node_index.options|fields|search_api_viewed
+features[features_overrides][] = search_api_index.node_index.enabled
 features[features_overrides][] = search_api_index.node_index.options|data_alter_callbacks|search_api_alter_add_url|status
 features[features_overrides][] = search_api_index.node_index.options|data_alter_callbacks|search_api_alter_add_viewed_entity|status
 features[features_overrides][] = search_api_index.node_index.options|data_alter_callbacks|search_api_alter_node_access|status
+features[features_overrides][] = search_api_index.node_index.options|data_alter_callbacks|search_api_attachments_alter_settings
+features[features_overrides][] = search_api_index.node_index.options|fields|search_api_access_node
+features[features_overrides][] = search_api_index.node_index.options|fields|search_api_url
+features[features_overrides][] = search_api_index.node_index.options|fields|search_api_viewed
+features[features_overrides][] = search_api_index.node_index.options|processors|search_api_case_ignore|settings|fields|search_api_viewed
 features[features_overrides][] = search_api_index.node_index.options|processors|search_api_case_ignore|status
+features[features_overrides][] = search_api_index.node_index.options|processors|search_api_html_filter|settings|fields|search_api_viewed
+features[features_overrides][] = search_api_index.node_index.options|processors|search_api_tokenizer|settings|fields|search_api_viewed
 features[features_overrides][] = search_api_index.node_index.options|processors|search_api_tokenizer|status
+features[features_overrides][] = search_api_index.node_index.options|processors|search_api_transliteration|settings|fields|search_api_viewed
+features[features_overrides][] = search_api_index.node_index.server
+features[features_overrides][] = search_api_server.database_server.options|indexes|database_node_index|search_api_viewed
+features[features_overrides][] = search_api_server.solr_server.enabled
 features[features_overrides][] = views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|breadcrumb
+features[features_overrides][] = views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|breadcrumb_enable
 features[features_overrides][] = views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|not
 features[features_overrides][] = views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|title
 features[features_overrides][] = views_view.panopoly_search.display|default|display_options|arguments|search_api_views_fulltext|title_enable