diff --git a/.gitignore b/.gitignore
index 9595be5..c8ece8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ dist
 
 # Created by unit tests
 .pytest_cache/
+/.gtm/
diff --git a/__init__.py b/__init__.py
index fec5788..ebb63fb 100644
--- a/__init__.py
+++ b/__init__.py
@@ -260,7 +260,7 @@ def CQS_match_query_phrase(self, phrase):
         summary = self.ask_the_duck(sess)
         if summary:
             self.log.info(f"DDG answer: {summary}")
-            return (phrase, CQSMatchLevel.GENERAL, summary,
+            return (phrase, CQSMatchLevel.CATEGORY, summary,
                     {'query': phrase,
                      'answer': summary})
 
@@ -283,10 +283,11 @@ def ask_the_duck(self, sess):
             DuckDuckGoSolver.enable_tx = True
 
         query = self.session_results[sess.session_id]["query"]
-        self.set_context("DuckKnows", query)
         results = self.duck.long_answer(query, lang=sess.lang)
         self.session_results[sess.session_id]["results"] = results
-        return results[0]["summary"]
+        if results:
+            self.set_context("DuckKnows", query)
+            return results[0]["summary"]
 
     def display_ddg(self, sess: Session):
         if not can_use_gui(self.bus):