diff --git a/views_filters_selective/views_handler_filter_selective.inc b/views_filters_selective/views_handler_filter_selective.inc
index b180d58..1d437ca 100644
--- a/views_filters_selective/views_handler_filter_selective.inc
+++ b/views_filters_selective/views_handler_filter_selective.inc
@@ -14,21 +14,27 @@ class views_handler_filter_selective extends views_handler_filter_in_operator {
         // Encode the values to keep special chars.
         $this->value_options = array_combine(array_map('urlencode', array_values($options)), array_values($options));
       }
-      // Modify value_options to include title for term node reference fields.
-      if ($this->definition['proxy'] == 'views_handler_filter_term_node_tid') {
-        foreach ($this->value_options as $tid) {
-          $result = db_query('SELECT name FROM {taxonomy_term_data} WHERE tid = :tid', array(':tid' => $tid));
-          $title = $result->fetchField();
-          if (!empty($title)) {
-            $this->value_options[$tid] = $title;
+      // Modify value_options to include title based on the filter type.
+      switch ($this->definition['proxy']) {
+        case 'views_handler_filter_term_node_tid':
+        case 'i18nviews_handler_filter_taxonomy_index_tid':
+          $result = db_query("SELECT tid, name FROM {taxonomy_term_data} WHERE tid IN (:tids)", array(':tids' => $this->value_options));
+          while ($row = $result->fetchObject()) {
+            if (!empty($row->name)) {
+              if ($this->definition['proxy'] == 'i18nviews_handler_filter_taxonomy_index_tid') {
+                $row->name = i18n_string('taxonomy:term:'. $row->tid .':name', $row->name);
+              }
+              $this->value_options[$row->tid] = $row->name;
+            }
           }
-        }
-        // Re-sort results based on title.
-        asort($this->value_options);
+
+          // Re-sort results based on title.
+          asort($this->value_options);
+          break;
       }
 
       // Remove empty values.
-      $this->value_options = array_diff_key($this->value_options , array("" => NULL)); 
+      $this->value_options = array_diff_key($this->value_options , array("" => NULL));
     }
   }