diff --git a/src/McpServer/autopilot-monitor-mcp/src/tools/search.ts b/src/McpServer/autopilot-monitor-mcp/src/tools/search.ts
index 965fe7d4..7226ba0c 100644
--- a/src/McpServer/autopilot-monitor-mcp/src/tools/search.ts
+++ b/src/McpServer/autopilot-monitor-mcp/src/tools/search.ts
@@ -67,7 +67,7 @@ function extractKeywords(query: string): string[] {
     .toLowerCase()
     .replace(/[^\w\s-]/g, ' ')
     .split(/\s+/)
-    .filter((w) => (w.length > 2 || DOMAIN_SHORT_KEYWORDS.has(w)) && !KEYWORD_STOP_WORDS.has(w));
+    .filter((w) => (w.length > 2 || DOMAIN_SHORT_KEYWORDS.has(w)) && (DOMAIN_SHORT_KEYWORDS.has(w) || !KEYWORD_STOP_WORDS.has(w)));
 }
 
 // ── Weighted keyword scoring ────────────────────────────────────────────