diff --git a/atlasbot/engine/answerer.py b/atlasbot/engine/answerer.py
index 22e5b4c..239dc8e 100644
--- a/atlasbot/engine/answerer.py
+++ b/atlasbot/engine/answerer.py
@@ -450,9 +450,12 @@ class AnswerEngine:
                         if key_lines:
                             metric_facts = _merge_fact_lines(key_lines, metric_facts)
                     if metric_facts:
+                        metric_cover_tokens = [tok for tok in keyword_tokens if tok and tok not in GENERIC_METRIC_TOKENS]
+                        if not metric_cover_tokens:
+                            metric_cover_tokens = [tok for tok in question_tokens if tok and tok not in GENERIC_METRIC_TOKENS]
                         metric_facts = _ensure_token_coverage(
                             metric_facts,
-                            all_tokens,
+                            metric_cover_tokens or all_tokens,
                             summary_lines,
                             max_add=plan.max_subquestions,
                         )