diff --git a/apps/backend/src/app/api/latest/ai/query/[mode]/route.ts b/apps/backend/src/app/api/latest/ai/query/[mode]/route.ts
index da68e5b23..2a3a742d2 100644
--- a/apps/backend/src/app/api/latest/ai/query/[mode]/route.ts
+++ b/apps/backend/src/app/api/latest/ai/query/[mode]/route.ts
@@ -63,7 +63,11 @@ export const POST = createSmartRouteHandler({
       systemPrompt += await getVerifiedQaContext();
     }
     systemPrompt += await getMcpSkillContextPrompt(body.mcpCallMetadata?.toolName);
-    const tools = await getTools(toolNames, { auth: fullReq.auth, targetProjectId: projectId });
+    const tools = await getTools(toolNames, {
+      auth: fullReq.auth,
+      targetProjectId: projectId,
+      mcpToolName: body.mcpCallMetadata?.toolName,
+    });
     const toolsArg = Object.keys(tools).length > 0 ? tools : undefined;
     const isCreateDashboard = systemPromptId === "create-dashboard";
     const isBuildAnalyticsQuery = systemPromptId === "build-analytics-query";
diff --git a/apps/backend/src/lib/ai/mcp-skill-context.ts b/apps/backend/src/lib/ai/mcp-skill-context.ts
index efe475cf7..0452b787c 100644
--- a/apps/backend/src/lib/ai/mcp-skill-context.ts
+++ b/apps/backend/src/lib/ai/mcp-skill-context.ts
@@ -5,7 +5,7 @@ const CACHE_TTL_MS = 5 * 60 * 1_000; // 5 minutes
 let cachedDocs: { text: string, fetchedAt: number } | null = null;
 
 async function fetchDocsText(): Promise<string> {
-  const now = Date.now();
+  const now = performance.now();
   if (cachedDocs && now - cachedDocs.fetchedAt < CACHE_TTL_MS) {
     return cachedDocs.text;
   }