diff --git a/src/components/DirectNeighbors.vue b/src/components/DirectNeighbors.vue
index 52f27d5..90d08da 100644
--- a/src/components/DirectNeighbors.vue
+++ b/src/components/DirectNeighbors.vue
@@ -88,6 +88,7 @@
 
       <template v-slot:item.relevant_node.tags="{ item }">
         <v-chip
+          v-if="item.relevant_node.tags"
           v-for="tag in Object.keys(item.relevant_node.tags)"
           :key="tag"
           class="mr-2"
diff --git a/src/components/EntitySelector.vue b/src/components/EntitySelector.vue
index 00e9e0a..3533e22 100644
--- a/src/components/EntitySelector.vue
+++ b/src/components/EntitySelector.vue
@@ -53,6 +53,7 @@ import axios from "axios";
 
 import { ENTITY_TYPES } from "@/definitions/entityDefinitions.js";
 import { INDICATOR_TYPES } from "@/definitions/indicatorDefinitions.js";
+import { DFIQ_TYPES } from "@/definitions/dfiqDefinitions.js";
 
 import _ from "lodash";
 </script>
@@ -93,14 +94,18 @@ export default {
       const params = { query: { name: searchQuery }, count: 20 };
       const entities = (await axios.post("/api/v2/entities/search", params)).data.entities;
       const indicators = (await axios.post("/api/v2/indicators/search", params)).data.indicators;
-      let items = entities.concat(indicators).map(item => {
-        return {
-          id: item.id,
-          root_type: item.root_type,
-          name: item.name,
-          type: item.type
-        };
-      });
+      const dfiq = (await axios.post("/api/v2/dfiq/search", params)).data.dfiq;
+      let items = entities
+        .concat(indicators)
+        .concat(dfiq)
+        .map(item => {
+          return {
+            id: item.id,
+            root_type: item.root_type,
+            name: item.name,
+            type: item.type
+          };
+        });
       if (this.typeFilter.length > 0) {
         items = items.filter(item => this.typeFilter.includes(item.type) || this.typeFilter.includes(item.root_type));
       }
@@ -113,16 +118,19 @@ export default {
       this.$emit("selected-object", this.selectedEntity);
     },
     getIconForType(type) {
-      return (ENTITY_TYPES.find(t => t.type === type) || INDICATOR_TYPES.find(t => t.type === type)).icon;
-    },
-
+      return (
+        ENTITY_TYPES.find(t => t.type === type) ||
+        INDICATOR_TYPES.find(t => t.type === type) ||
+        DFIQ_TYPES.find(t => t.type === type)
+      ).icon;
+    }
   },
   computed: {
     getHintForTypes() {
       if (this.typeFilter.length > 0) {
-      return 'Filtering for ' + this.typeFilter.join(", ");
+        return "Filtering for " + this.typeFilter.join(", ");
       } else {
-        return 'Filtering for all object types';
+        return "Filtering for all object types";
       }
     }
   }
diff --git a/src/components/LinkObject.vue b/src/components/LinkObject.vue
index 8db7b04..56e09d5 100644
--- a/src/components/LinkObject.vue
+++ b/src/components/LinkObject.vue
@@ -67,6 +67,7 @@ import axios from "axios";
 import { ENTITY_TYPES } from "@/definitions/entityDefinitions.js";
 import { INDICATOR_TYPES } from "@/definitions/indicatorDefinitions.js";
 import { OBSERVABLE_TYPES } from "@/definitions/observableDefinitions.js";
+import { DFIQ_TYPES } from "@/definitions/dfiqDefinitions.js";
 
 import { LINK_SUGGESTIONS } from "@/definitions/linkSuggestions.js";
 import EntitySelector from "@/components/EntitySelector.vue";
@@ -159,7 +160,8 @@ export default {
       return (
         ENTITY_TYPES.find(t => t.type === type) ||
         INDICATOR_TYPES.find(t => t.type === type) ||
-        OBSERVABLE_TYPES.find(t => t.type === type)
+        OBSERVABLE_TYPES.find(t => t.type === type) ||
+        DFIQ_TYPES.find(t => t.type === type)
       ).icon;
     }
   },
@@ -187,14 +189,15 @@ export default {
       return (LINK_SUGGESTIONS[this.object.type] || LINK_SUGGESTIONS[this.object.root_type])
         .filter(
           suggestion =>
-            suggestion.targets.includes(this.linkTarget.type) || suggestion.targets.includes(this.linkTarget.type)
+            suggestion.targets.includes(this.linkTarget.type) || suggestion.targets.includes(this.linkTarget.root_type)
         )
         .map(suggestion => suggestion.verb);
     },
     getIncomingLinkTypeSuggestions() {
       return (LINK_SUGGESTIONS[this.linkTarget.type] || LINK_SUGGESTIONS[this.linkTarget.root_type])
         .filter(
-          suggestion => suggestion.targets.includes(this.object.type) || suggestion.targets.includes(this.object.type)
+          suggestion =>
+            suggestion.targets.includes(this.object.type) || suggestion.targets.includes(this.object.root_type)
         )
         .map(suggestion => suggestion.verb);
     },
diff --git a/src/definitions/linkSuggestions.js b/src/definitions/linkSuggestions.js
index bf65ed2..d5269a7 100644
--- a/src/definitions/linkSuggestions.js
+++ b/src/definitions/linkSuggestions.js
@@ -100,5 +100,10 @@ export const LINK_SUGGESTIONS = {
     },
     { verb: "uses", targets: ["infrastructure"] }
   ],
-  vulnerability: []
+  vulnerability: [],
+  // DFIQ
+  scenario: [{ verb: "Uses DFIQ facet", targets: ["facet"] }],
+  facet: [{ verb: "Uses DFIQ question", targets: ["question"] }],
+  question: [{ verb: "Uses DFIQ approach", targets: ["approach"] }],
+  approach: [{ verb: "Uses indicator", targets: ["indicator"] }]
 };