diff --git a/core/filters.py b/core/filters.py
index 5afc9c4c..a7c57f7e 100644
--- a/core/filters.py
+++ b/core/filters.py
@@ -509,6 +509,8 @@ class AddressFilter(FilterSet):
 
 
 class BaseAutocompleteFilter(SimpleListFilter):
+    template = "admin/autocomplete_filter.html"
+
     def lookups(self, request, model_admin):
         return ()
 
@@ -516,14 +518,18 @@ class BaseAutocompleteFilter(SimpleListFilter):
         url = reverse(
             f"admin:{changelist.opts.app_label}_{self.parameter_name}_autocomplete"
         )
-        qs   = changelist.get_query_string(remove=[self.parameter_name])
-        val  = changelist.params.get(self.parameter_name, "")
+        current = changelist.params.get(self.parameter_name, "")
         html = (
-            f'<input type="hidden" class="django-autocomplete admin-autocomplete-filter" '
-            f'data-autocomplete-url="{url}" name="{self.parameter_name}" value="{val}"/>'
+            f'<input type="hidden" '
+            f'class="django-autocomplete admin-autocomplete-filter" '
+            f'data-autocomplete-url="{url}" '
+            f'name="{self.parameter_name}" '
+            f'value="{current}"/>'
         )
         # noinspection DjangoSafeString
-        yield {"query_string": qs, "display": mark_safe(html)}
+        yield {
+            "display": mark_safe(html),
+        }
 
 
 class BrandAdminFilter(BaseAutocompleteFilter):
diff --git a/core/templates/autocomplete_filter.html b/core/templates/autocomplete_filter.html
new file mode 100644
index 00000000..2dbc753d
--- /dev/null
+++ b/core/templates/autocomplete_filter.html
@@ -0,0 +1,11 @@
+{% comment %}
+A custom filter template that
+only cares about our `display` key.
+{% endcomment %}
+
+<div class="module filter-{{ spec.parameter_name|slugify }}">
+  <h3>{{ spec.title }}</h3>
+  {% for choice in spec.choices cl %}
+    {{ choice.display|safe }}
+  {% endfor %}
+</div>