diff --git a/core/templates/ui/drilldown/drilldown.html b/core/templates/ui/drilldown/drilldown.html
index 09c3de1..3b2e3bb 100644
--- a/core/templates/ui/drilldown/drilldown.html
+++ b/core/templates/ui/drilldown/drilldown.html
@@ -362,9 +362,6 @@
   </div>
   <div class="block">
     <input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">
-    <script>
-      setupTags();
-    </script>
   </div>
   <div class="block">
     <div id="results">
diff --git a/core/templates/ui/drilldown/results.html b/core/templates/ui/drilldown/results.html
index 69d8e61..8cf6b55 100644
--- a/core/templates/ui/drilldown/results.html
+++ b/core/templates/ui/drilldown/results.html
@@ -203,7 +203,14 @@
   var inputTags = document.getElementsByClassName('tags-input');
   var inputBox = document.querySelector("[placeholder='Add query']");
   var isFocused = (document.activeElement === inputBox);
-  inputTags[0].outerHTML = '<input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">';
+  for (index = 0; index < inputTags.length; index++) {
+    if (index == 0) {
+      inputTags[0].outerHTML = '<input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">';
+    } else {
+      inputTags[index].remove();
+    }
+  }
+  // inputTags[0].outerHTML = '<input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">';
   setupTags();
   var inputBox = document.querySelector("[placeholder='Add query']");
   if (isFocused) {