diff --git a/src/codehelp/context.py b/src/codehelp/context.py
index 91a0cf8..c7235ca 100644
--- a/src/codehelp/context.py
+++ b/src/codehelp/context.py
@@ -73,8 +73,12 @@ def _list_fmt(s: str) -> str:
 
     def prompt_str(self) -> str:
         """ Convert this context into a string to be used in an LLM prompt. """
+        # if nothing is provided but a name, use just that name by itself
+        if not self.tools and not self.details and not self.avoid:
+            return self.name
+
         template = jinja_env_prompt.from_string("""\
-<name>{{ name }}</name>
+Context name: <name>{{ name }}</name>
 {% if tools %}
 Environment and tools: <tools>{{ tools }}</tools>
 {% endif %}
diff --git a/src/codehelp/helper.py b/src/codehelp/helper.py
index e0da360..213f994 100644
--- a/src/codehelp/helper.py
+++ b/src/codehelp/helper.py
@@ -310,10 +310,10 @@ def get_topics(llm: LLMConfig, query_id: int) -> list[str]:
         return []
 
     messages = prompts.make_topics_prompt(
-        '',  # TODO: put this back: query_row['context'],
         query_row['code'],
         query_row['error'],
         query_row['issue'],
+        '',  # TODO: put this back: query_row['context'],
         responses['main']
     )