diff --git a/atlasbot/engine/answerer.py b/atlasbot/engine/answerer.py
index 4ee93aa..4df45e5 100644
--- a/atlasbot/engine/answerer.py
+++ b/atlasbot/engine/answerer.py
@@ -614,8 +614,10 @@ class AnswerEngine:
 
             if classify.get("question_type") in {"metric", "diagnostic"}:
                 lowered_q = f"{question} {normalized}".lower()
-                if any(tok in lowered_q for tok in ("hardware", "class", "type", "rpi", "jetson", "amd64", "arm64")) and any(
-                    tok in lowered_q for tok in ("average", "avg", "mean", "ram", "memory", "cpu", "load")
+                if (
+                    focus_entity != "node"
+                    and any(tok in lowered_q for tok in ("hardware", "class", "type", "rpi", "jetson", "amd64", "arm64"))
+                    and any(tok in lowered_q for tok in ("average", "avg", "mean", "per hardware", "by hardware", "typical"))
                 ):
                     hw_top = None
                     for line in summary_lines: