diff --git a/plugins/linkit_plugins/linkit-plugin-entity.class.php b/plugins/linkit_plugins/linkit-plugin-entity.class.php
index 47e8043..81adcd9 100644
--- a/plugins/linkit_plugins/linkit-plugin-entity.class.php
+++ b/plugins/linkit_plugins/linkit-plugin-entity.class.php
@@ -56,7 +56,8 @@ class LinkitPluginEntity extends LinkitPlugin {
     $this->entity_info = entity_get_info($this->plugin['entity_type']);
 
     // Set bundle key name.
-    if (isset($this->entity_info['entity keys']['bundle'])) {
+    if (isset($this->entity_info['entity keys']['bundle']) &&
+      !isset($this->entity_key_bundle)) {
       $this->entity_key_bundle = $this->entity_info['entity keys']['bundle'];
     }
 
diff --git a/plugins/linkit_plugins/linkit-plugin-taxonomy_term.class.php b/plugins/linkit_plugins/linkit-plugin-taxonomy_term.class.php
index 1147066..fd8d738 100644
--- a/plugins/linkit_plugins/linkit-plugin-taxonomy_term.class.php
+++ b/plugins/linkit_plugins/linkit-plugin-taxonomy_term.class.php
@@ -2,8 +2,41 @@
 /**
  * @file
  * Define Linkit term plugin class.
- *
- * This is empty as we just have to define that this class exists.
  */
 
-class LinkitPluginTaxonomy_Term extends LinkitPluginEntity {}
\ No newline at end of file
+class LinkitPluginTaxonomy_Term extends LinkitPluginEntity {
+  function __construct($plugin, $profile) {
+    /**
+     * The term entity dont use the same column name as in the entity keys
+     * bundle definition, so lets add it our self.
+     */
+    $this->entity_key_bundle = 'vid';
+    parent::__construct($plugin, $profile);
+  }
+
+  /**
+   * Extend the parent buildSettingsForm() method.
+   */
+  function buildSettingsForm() {
+    $form = parent::buildSettingsForm();
+
+    // The term entity dont use the entity keys bundle definition, ut used the
+    // vid instead, so lets alter the bundles settings for terms.
+    if (isset($form[$this->plugin['name']]['bundles'])) {
+      $bundles = array();
+      $vocabularies = taxonomy_get_vocabularies();
+      foreach ($vocabularies as $vocabulary) {
+        $bundles[$vocabulary->vid] = check_plain($vocabulary->name);
+      }
+
+      $form[$this->plugin['name']]['bundles'] = array(
+        '#title' => t('Type filter'),
+        '#type' => 'checkboxes',
+        '#options' => $bundles,
+        '#default_value' => isset($this->conf['bundles']) ? $this->conf['bundles'] : array(),
+        '#description' => t('If left blank, all types will appear in autocomplete results.'),
+      );
+    }
+    return $form;
+  }
+}
\ No newline at end of file