diff --git a/views/search_api_multi.views.inc b/views/search_api_multi.views.inc
index 6a370bf..7e0b381 100644
--- a/views/search_api_multi.views.inc
+++ b/views/search_api_multi.views.inc
@@ -8,6 +8,7 @@
 function search_api_multi_views_data() {
   $data = array();
   $servers = array();
+  $field_handlers = entity_views_get_field_handlers();
   foreach (search_api_index_load_multiple(FALSE) as $index) {
     if (!($server = $index->server()) || !$server->supportsFeature('search_api_multi')) {
       continue;
@@ -79,7 +80,7 @@ function search_api_multi_views_data() {
             $table[$key]['title'] = $info['label'];
             $table[$key]['help'] = empty($info['description']) ? t('(No information available)') : $info['description'];
             $table[$key]['type'] = $type;
-            $table[$key]['field']['handler'] = _search_api_views_field_handler($type, $inner_type);
+            entity_views_field_definition($key, $info, $table);
             if ($inner_type == 'options') {
               $table[$key]['field']['options'] = $value->optionsList();
             }
@@ -89,7 +90,7 @@ function search_api_multi_views_data() {
               // Discern between original and indexed type
               $table[$key]['field']['type'] = $table[$key]['type'];
               $table[$key]['type'] = $fields[$prefix . $property]['type'];
-              $table[$key] += _search_api_views_add_handlers($fields[$prefix . $property], $value);
+              _search_api_views_add_handlers($key, $fields[$prefix . $property], $value, $table);
               if (!empty($table[$key]['sort'])) {
                 $table[$key]['field']['click sortable'] = TRUE;
               }
@@ -137,7 +138,7 @@ function search_api_multi_views_data() {
       $table[$key]['title'] = $name;
       $table[$key]['help'] = empty($info['description']) ? t('(No information available)') : $info['description'];
       $table[$key]['type'] = $field['type'];
-      $table[$key] += _search_api_views_add_handlers($field, $tmp);
+      _search_api_views_add_handlers($key, $field, $tmp, $table);
     }
 
     // Special handlers
@@ -145,7 +146,7 @@ function search_api_multi_views_data() {
     $table['search_api_relevance']['title'] = t('Relevance');
     $table['search_api_relevance']['help'] = t('The relevance of this search result with respect to the query.');
     $table['search_api_relevance']['type'] = 'decimal';
-    $table['search_api_relevance']['field']['handler'] = _search_api_views_field_handler('decimal', 'decimal');
+    $table['search_api_relevance']['field']['handler'] = $field_handlers['decimal'];
     $table['search_api_relevance']['field']['click sortable'] = TRUE;
     $table['search_api_relevance']['sort']['handler'] = 'SearchApiViewsHandlerSort';
 
@@ -164,7 +165,7 @@ function search_api_multi_views_data() {
     $table['search_api_multi_index']['title'] = t('Index');
     $table['search_api_multi_index']['help'] = t('The search indexes that will be searched.');
     $table['search_api_multi_index']['type'] = 'options';
-    $table['search_api_multi_index']['field']['handler'] = _search_api_views_field_handler('options', 'options');
+    $table['search_api_multi_index']['field']['handler'] = $field_handlers['options'];
     $table['search_api_multi_index']['field']['options'] = $indexes;
     $table['search_api_multi_index']['argument']['handler'] = 'SearchApiViewsHandlerArgument';
     $table['search_api_multi_index']['filter']['handler'] = 'SearchApiViewsHandlerFilterOptions';