diff --git a/archivebox/core/mixins.py b/archivebox/core/mixins.py
index 538ca1e3..b1507605 100644
--- a/archivebox/core/mixins.py
+++ b/archivebox/core/mixins.py
@@ -2,22 +2,19 @@ from django.contrib import messages
 
 from archivebox.search import query_search_index
 
-class SearchResultsAdminMixin(object):
-    def get_search_results(self, request, queryset, search_term):
-        ''' Enhances the search queryset with results from the search backend.
-        '''
-        qs, use_distinct = \
-            super(SearchResultsAdminMixin, self).get_search_results(
-                request, queryset, search_term)
+class SearchResultsAdminMixin:
+    def get_search_results(self, request, queryset, search_term: str):
+        """Enhances the search queryset with results from the search backend"""
+        
+        qs, use_distinct = super().get_search_results(request, queryset, search_term)
 
         search_term = search_term.strip()
         if not search_term:
             return qs, use_distinct
         try:
             qsearch = query_search_index(search_term)
+            qs = qs | qsearch
         except Exception as err:
             messages.add_message(request, messages.WARNING, f'Error from the search backend, only showing results from default admin search fields - Error: {err}')
-        else:
-            qs = queryset & qsearch
-        finally:
-            return qs, use_distinct
+        
+        return qs, use_distinct
diff --git a/archivebox/main.py b/archivebox/main.py
index fb7c1d39..3af26e5d 100644
--- a/archivebox/main.py
+++ b/archivebox/main.py
@@ -448,7 +448,7 @@ def init(force: bool=False, quick: bool=False, setup: bool=False, out_dir: Path=
 
     if setup:
         run_subcommand('setup', pwd=out_dir)
-    
+
     if Snapshot.objects.count() < 25:     # hide the hints for experienced users
         print()
         print('    {lightred}Hint:{reset} To view your archive index, run:'.format(**ANSI))