diff --git a/core/templates/ui/drilldown/drilldown.html b/core/templates/ui/drilldown/drilldown.html
index a3c55f9..4f89739 100644
--- a/core/templates/ui/drilldown/drilldown.html
+++ b/core/templates/ui/drilldown/drilldown.html
@@ -8,17 +8,23 @@
       var present = true;
       if (present == true) {
         var toAppend = ` AND ${field}: "${value}"`;
+        var toRemove = `${field}: "${value}"`;
       } else {
         var toAppend = ` AND NOT ${field}: "${value}"`;
+        var toRemove = `NOT ${field}: "${value}"`;
       }
-      if (!queryElement.value.includes(toAppend)) {
+      if (!queryElement.value.includes(toAppend) && !queryElement.value.includes(toRemove)) {
         queryElement.value+=toAppend;
       } else {
-        queryElement.value = queryElement.value.replace(toAppend, "");
+          queryElement.value = queryElement.value.replaceAll(toAppend, "");
+          queryElement.value = queryElement.value.replaceAll(toRemove, "");
       }
       if (field == "src") {
         document.getElementById("source").selectedIndex = 0;
       }
+      if (queryElement.value.startsWith(" AND ")) {
+        queryElement.value = queryElement.value.replace(" AND ", "");
+      }
       htmx.trigger("#search", "click");
     }
   </script>