diff --git a/atlasbot/llm/prompts.py b/atlasbot/llm/prompts.py
index b270d69..4f24e2f 100644
--- a/atlasbot/llm/prompts.py
+++ b/atlasbot/llm/prompts.py
@@ -272,6 +272,7 @@ FACT_TYPES_SYSTEM = (
 
 FACT_TYPES_PROMPT = (
     "Return JSON with field: fact_types (list of short noun phrases). "
+    "Include at least one entry derived directly from the question wording (verbatim nouns). "
     "Keep each entry short and concrete (e.g., \"node pressure flags\", \"hardware class counts\", \"postgres connections\")."
 )
 
@@ -284,7 +285,8 @@ SIGNAL_SYSTEM = (
 SIGNAL_PROMPT = (
     "Question: {question}\nFactTypes: {fact_types}\n"
     "Return JSON with field: signals (list). "
-    "Signals should be brief phrases or tokens that might appear in snapshot lines."
+    "Signals should be brief phrases or tokens that might appear in snapshot lines. "
+    "Always include the key nouns from the question as-is."
 )
 
 CHUNK_SCAN_SYSTEM = (