1 files changed, 10 insertions, 7 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index f07a20eac..57551a655 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -49,7 +49,7 @@ from searx.languages import language_codes
 from searx.https_rewrite import https_url_rewrite
 from searx.search import Search
 from searx.query import Query
-from searx.autocomplete import backends as autocomplete_backends
+from searx.autocomplete import searx_bang, backends as autocomplete_backends
 from searx import logger
 
 
@@ -74,8 +74,6 @@ app = Flask(
 
 app.secret_key = settings['server']['secret_key']
 
-app.logger.addHandler(logger)
-
 babel = Babel(app)
 
 global_favicons = []
@@ -396,17 +394,22 @@ def autocompleter():
 
     # check if search query is set
     if not query.getSearchQuery():
-        return
+        return '', 400
 
     # run autocompleter
     completer = autocomplete_backends.get(request.cookies.get('autocomplete'))
 
     # check if valid autocompleter is selected
     if not completer:
-        return
+        return '', 400
+
+    # parse searx specific autocompleter results like !bang
+    raw_results = searx_bang(query)
 
-    # run autocompletion
-    raw_results = completer(query.getSearchQuery())
+    # normal autocompletion results only appear if max 3. searx results returned
+    if len(raw_results) <= 3:
+        # run autocompletion
+        raw_results.extend(completer(query.getSearchQuery()))
 
     # parse results (write :language and !engine back to result string)
     results = []