diff --git a/contrib/search_api_views/search_api_views.views.inc b/contrib/search_api_views/search_api_views.views.inc
index a87e5bc..647768b 100644
--- a/contrib/search_api_views/search_api_views.views.inc
+++ b/contrib/search_api_views/search_api_views.views.inc
@@ -18,6 +18,7 @@ function search_api_views_views_data() {
       $table = &$data[$key];
       $type_info = search_api_get_item_type_info($index->item_type);
       $table['table']['group'] = t('Indexed @entity_type', array('@entity_type' => $type_info['name']));
+      $table['table']['entity type'] = NULL;
       $table['table']['base'] = array(
         'field' => 'search_api_id',
         'index' => $index->machine_name,
diff --git a/includes/index_entity.inc b/includes/index_entity.inc
index 824bf12..7a4234a 100644
--- a/includes/index_entity.inc
+++ b/includes/index_entity.inc
@@ -934,7 +934,12 @@ class SearchApiIndex extends Entity {
     $i = $only_indexed ? 1 : 0;
     if (!isset($this->fulltext_fields[$i])) {
       $this->fulltext_fields[$i] = array();
-      $fields = $only_indexed ? $this->options['fields'] : $this->getFields(FALSE);
+      if ($only_indexed) {
+        $fields = isset($this->options['fields']) ? $this->options['fields'] : array();
+      }
+      else {
+        $fields = $this->getFields(FALSE);
+      }
       foreach ($fields as $key => $field) {
         if (search_api_is_text_type($field['type'])) {
           $this->fulltext_fields[$i][] = $key;