diff --git a/core/modules/taxonomy/src/TermStorage.php b/core/modules/taxonomy/src/TermStorage.php
index 578928d..345921c 100644
--- a/core/modules/taxonomy/src/TermStorage.php
+++ b/core/modules/taxonomy/src/TermStorage.php
@@ -165,8 +165,8 @@ public function getSchema() {
     $schema['taxonomy_term_field_data']['fields']['weight']['not null'] = TRUE;
     $schema['taxonomy_term_field_data']['fields']['name']['not null'] = TRUE;
 
-    unset($schema['taxonomy_term_field_data']['indexes']['field__vid']);
-    unset($schema['taxonomy_term_field_data']['indexes']['field__description__format']);
+    unset($schema['taxonomy_term_field_data']['indexes']['taxonomy_term_field__vid__target_id']);
+    unset($schema['taxonomy_term_field_data']['indexes']['taxonomy_term_field__description__format']);
     $schema['taxonomy_term_field_data']['indexes'] += array(
       'taxonomy_term__tree' => array('vid', 'weight', 'name'),
       'taxonomy_term__vid_name' => array('vid', 'name'),
diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc
index 99d31a5..3f9793b 100644
--- a/core/modules/taxonomy/taxonomy.views.inc
+++ b/core/modules/taxonomy/taxonomy.views.inc
@@ -140,7 +140,7 @@ function taxonomy_views_data() {
     ),
   );
 
-  $data['taxonomy_term_field_data']['vid'] = array(
+  $data['taxonomy_term_data']['vid'] = array(
     'title' => t('Vocabulary'),
     'help' => t('Filter the results of "Taxonomy: Term" to a particular vocabulary.'),
     'filter' => array(