diff --git a/app/actions.tsx b/app/actions.tsx
index 31bba0bb..a1fb117f 100644
--- a/app/actions.tsx
+++ b/app/actions.tsx
@@ -13,10 +13,8 @@ import { Spinner } from '@/components/ui/spinner'
 import { Section } from '@/components/section'
 import { FollowupPanel } from '@/components/followup-panel'
 import { inquire, researcher, taskManager, querySuggestor, resolutionSearch, type DrawnFeature } from '@/lib/agents'
-// Removed import of useGeospatialToolMcp as it no longer exists and was incorrectly used here.
-// The geospatialTool (if used by agents like researcher) now manages its own MCP client.
 import { writer } from '@/lib/agents/writer'
-import { saveChat, getSystemPrompt } from '@/lib/actions/chat' // Added getSystemPrompt
+import { saveChat, getSystemPrompt } from '@/lib/actions/chat'
 import { Chat, AIMessage } from '@/lib/types'
 import { UserMessage } from '@/components/user-message'
 import { BotMessage } from '@/components/message'
@@ -24,17 +22,17 @@ import { SearchSection } from '@/components/search-section'
 import SearchRelated from '@/components/search-related'
 import { GeoJsonLayer } from '@/components/map/geojson-layer'
 import { MapDataUpdater } from '@/components/map/map-data-updater'
+import { ResolutionImage } from '@/components/resolution-image'
 import { CopilotDisplay } from '@/components/copilot-display'
 import RetrieveSection from '@/components/retrieve-section'
 import { VideoSearchSection } from '@/components/video-search-section'
-import { MapQueryHandler } from '@/components/map/map-query-handler' // Add this import
+import { MapQueryHandler } from '@/components/map/map-query-handler'
 
 // Define the type for related queries
 type RelatedQueries = {
   items: { query: string }[]
 }
 
-// Removed mcp parameter from submit, as geospatialTool now handles its client.
 async function submit(formData?: FormData, skip?: boolean) {
   'use server'
 
@@ -44,16 +42,17 @@ async function submit(formData?: FormData, skip?: boolean) {
   const isCollapsed = createStreamableValue(false)
 
   const action = formData?.get('action') as string;
+  const drawnFeaturesString = formData?.get('drawnFeatures') as string;
+  let drawnFeatures: DrawnFeature[] = [];
+  try {
+    drawnFeatures = drawnFeaturesString ? JSON.parse(drawnFeaturesString) : [];
+  } catch (e) {
+    console.error('Failed to parse drawnFeatures:', e);
+  }
+
   if (action === 'resolution_search') {
     const file = formData?.get('file') as File;
     const timezone = (formData?.get('timezone') as string) || 'UTC';
-    const drawnFeaturesString = formData?.get('drawnFeatures') as string;
-    let drawnFeatures: DrawnFeature[] = [];
-    try {
-      drawnFeatures = drawnFeaturesString ? JSON.parse(drawnFeaturesString) : [];
-    } catch (e) {
-      console.error('Failed to parse drawnFeatures:', e);
-    }
 
     if (!file) {
       throw new Error('No file provided for resolution search.');
@@ -62,7 +61,6 @@ async function submit(formData?: FormData, skip?: boolean) {
     const buffer = await file.arrayBuffer();
     const dataUrl = `data:${file.type};base64,${Buffer.from(buffer).toString('base64')}`;
 
-    // Get the current messages, excluding tool-related ones.
     const messages: CoreMessage[] = [...(aiState.get().messages as any[])].filter(
       message =>
         message.role !== 'tool' &&
@@ -72,16 +70,12 @@ async function submit(formData?: FormData, skip?: boolean) {
         message.type !== 'resolution_search_result'
     );
 
-    // The user's prompt for this action is static.
     const userInput = 'Analyze this map view.';
-
-    // Construct the multimodal content for the user message.
     const content: CoreMessage['content'] = [
       { type: 'text', text: userInput },
       { type: 'image', image: dataUrl, mimeType: file.type }
     ];
 
-    // Add the new user message to the AI state.
     aiState.update({
       ...aiState.get(),
       messages: [
@@ -91,12 +85,11 @@ async function submit(formData?: FormData, skip?: boolean) {
     });
     messages.push({ role: 'user', content });
 
-    // Create a streamable value for the summary.
-    const summaryStream = createStreamableValue<string>('');
+    const summaryStream = createStreamableValue<string>('Analyzing map view...');
+    const groupeId = nanoid();
 
     async function processResolutionSearch() {
       try {
-        // Call the simplified agent, which now returns a stream.
         const streamResult = await resolutionSearch(messages, timezone, drawnFeatures);
 
         let fullSummary = '';
@@ -108,22 +101,41 @@ async function submit(formData?: FormData, skip?: boolean) {
         }
 
         const analysisResult = await streamResult.object;
-
-        // Mark the summary stream as done with the result.
         summaryStream.done(analysisResult.summary || 'Analysis complete.');
 
+        if (analysisResult.geoJson) {
+          uiStream.append(
+            <GeoJsonLayer
+              id={groupeId}
+              data={analysisResult.geoJson as FeatureCollection}
+            />
+          );
+        }
+
         messages.push({ role: 'assistant', content: analysisResult.summary || 'Analysis complete.' });
 
         const sanitizedMessages: CoreMessage[] = messages.map(m => {
           if (Array.isArray(m.content)) {
             return {
               ...m,
-              content: m.content.filter(part => part.type !== 'image')
+              content: m.content.filter((part: any) => part.type !== 'image')
             } as CoreMessage
           }
           return m
         })
 
+        const currentMessages = aiState.get().messages;
+        const sanitizedHistory = currentMessages.map(m => {
+          if (m.role === "user" && Array.isArray(m.content)) {
+            return {
+              ...m,
+              content: m.content.map((part: any) =>
+                part.type === "image" ? { ...part, image: "IMAGE_PROCESSED" } : part
+              )
+            }
+          }
+          return m
+        });
         const relatedQueries = await querySuggestor(uiStream, sanitizedMessages);
         uiStream.append(
           <Section title="Follow-up">
@@ -133,8 +145,6 @@ async function submit(formData?: FormData, skip?: boolean) {
 
         await new Promise(resolve => setTimeout(resolve, 500));
 
-        const groupeId = nanoid();
-
         aiState.done({
           ...aiState.get(),
           messages: [
@@ -148,7 +158,10 @@ async function submit(formData?: FormData, skip?: boolean) {
             {
               id: groupeId,
               role: 'assistant',
-              content: JSON.stringify(analysisResult),
+              content: JSON.stringify({
+                ...analysisResult,
+                image: dataUrl
+              }),
               type: 'resolution_search_result'
             },
             {
@@ -174,12 +187,11 @@ async function submit(formData?: FormData, skip?: boolean) {
       }
     }
 
-    // Start the background process without awaiting it.
     processResolutionSearch();
 
-    // Immediately update the UI stream with the BotMessage component.
     uiStream.update(
       <Section title="response">
+        <ResolutionImage src={dataUrl} />
         <BotMessage content={summaryStream.value} />
       </Section>
     );
@@ -199,7 +211,17 @@ async function submit(formData?: FormData, skip?: boolean) {
       message.type !== 'related' &&
       message.type !== 'end' &&
       message.type !== 'resolution_search_result'
-  )
+  ).map(m => {
+    if (Array.isArray(m.content)) {
+      return {
+        ...m,
+        content: m.content.filter((part: any) =>
+          part.type !== "image" || (typeof part.image === "string" && part.image.startsWith("data:"))
+        )
+      } as any
+    }
+    return m
+  })
 
   const groupeId = nanoid()
   const useSpecificAPI = process.env.USE_SPECIFIC_API_FOR_WRITER === 'true'
@@ -273,9 +295,8 @@ async function submit(formData?: FormData, skip?: boolean) {
       </Section>
     );
 
-    uiStream.append(answerSection);
+    uiStream.update(answerSection);
 
-    const groupeId = nanoid();
     const relatedQueries = { items: [] };
 
     aiState.done({
@@ -392,7 +413,6 @@ async function submit(formData?: FormData, skip?: boolean) {
   }
 
   const hasImage = messageParts.some(part => part.type === 'image')
-  // Properly type the content based on whether it contains images
   const content: CoreMessage['content'] = hasImage
     ? messageParts as CoreMessage['content']
     : messageParts.map(part => part.text).join('\n')
@@ -426,7 +446,6 @@ async function submit(formData?: FormData, skip?: boolean) {
 
   const userId = 'anonymous'
   const currentSystemPrompt = (await getSystemPrompt(userId)) || ''
-
   const mapProvider = formData?.get('mapProvider') as 'mapbox' | 'google'
 
   async function processEvents() {
@@ -475,7 +494,8 @@ async function submit(formData?: FormData, skip?: boolean) {
         streamText,
         messages,
         mapProvider,
-        useSpecificAPI
+        useSpecificAPI,
+        drawnFeatures
       )
       answer = fullResponse
       toolOutputs = toolResponses
@@ -717,12 +737,10 @@ export const getUIStateFromAIState = (aiState: AIState): UIState => {
             case 'input_related':
               let messageContent: string | any[]
               try {
-                // For backward compatibility with old messages that stored a JSON string
                 const json = JSON.parse(content as string)
                 messageContent =
                   type === 'input' ? json.input : json.related_query
               } catch (e) {
-                // New messages will store the content array or string directly
                 messageContent = content
               }
               return {
@@ -780,11 +798,13 @@ export const getUIStateFromAIState = (aiState: AIState): UIState => {
             case 'resolution_search_result': {
               const analysisResult = JSON.parse(content as string);
               const geoJson = analysisResult.geoJson as FeatureCollection;
+              const image = analysisResult.image as string;
 
               return {
                 id,
                 component: (
                   <>
+                    {image && <ResolutionImage src={image} />}
                     {geoJson && (
                       <GeoJsonLayer id={id} data={geoJson} />
                     )}
@@ -811,9 +831,23 @@ export const getUIStateFromAIState = (aiState: AIState): UIState => {
               toolOutput.type === 'MAP_QUERY_TRIGGER' &&
               name === 'geospatialQueryTool'
             ) {
+              const mapUrl = toolOutput.mcp_response?.mapUrl;
+              const placeName = toolOutput.mcp_response?.location?.place_name;
+
               return {
                 id,
-                component: <MapQueryHandler toolOutput={toolOutput} />,
+                component: (
+                  <>
+                    {mapUrl && (
+                      <ResolutionImage
+                        src={mapUrl}
+                        className="mb-0"
+                        alt={placeName ? `Map of ${placeName}` : 'Map Preview'}
+                      />
+                    )}
+                    <MapQueryHandler toolOutput={toolOutput} />
+                  </>
+                ),
                 isCollapsed: false
               }
             }
diff --git a/app/layout.tsx b/app/layout.tsx
index bddadc19..4369af43 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -65,6 +65,29 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en" suppressHydrationWarning>
+      <head>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `
+              (function() {
+                const htmxEvents = [
+                  'sseError', 'sseOpen', 'swapError', 'targetError', 'timeout',
+                  'validation:validate', 'validation:failed', 'validation:halted',
+                  'xhr:abort', 'xhr:loadend', 'xhr:loadstart'
+                ];
+                htmxEvents.forEach(event => {
+                  const funcName = 'func ' + event;
+                  if (typeof window[funcName] === 'undefined') {
+                    window[funcName] = function() { 
+                      console.warn('HTMX event handler "' + funcName + '" was called but not defined. Providing safety fallback.');
+                    };
+                  }
+                });
+              })();
+            `,
+          }}
+        />
+      </head>
       <body
         className={cn(
           'font-sans antialiased',
diff --git a/app_actions_diff.patch b/app_actions_diff.patch
new file mode 100644
index 00000000..b996b33a
--- /dev/null
+++ b/app_actions_diff.patch
@@ -0,0 +1,54 @@
+--- app/actions.tsx
++++ app/actions.tsx
+@@ -84,7 +84,7 @@
+     });
+     messages.push({ role: 'user', content });
+
+-    const summaryStream = createStreamableValue<string>('');
++    const summaryStream = createStreamableValue<string>('Analyzing map view...');
+     const groupeId = nanoid();
+
+     async function processResolutionSearch() {
+@@ -143,15 +143,26 @@
+           return m
+         })
+
++        const currentMessages = aiState.get().messages;
++        const sanitizedHistory = currentMessages.map(m => {
++          if (m.role === 'user' && Array.isArray(m.content)) {
++            return {
++              ...m,
++              content: m.content.map(part =>
++                part.type === 'image' ? { ...part, image: 'IMAGE_PROCESSED' } : part
++              )
++            } as AIMessage
++          }
++          return m
++        });
++
+         const relatedQueries = await querySuggestor(uiStream, sanitizedMessages);
+         uiStream.append(
+           <Section title="Follow-up">
+             <FollowupPanel />
+           </Section>
+         );
+
+         await new Promise(resolve => setTimeout(resolve, 500));
+
+         aiState.done({
+           ...aiState.get(),
+-          messages: [
+-            ...aiState.get().messages,
++          messages: [
++            ...sanitizedHistory,
+             {
+               id: groupeId,
+               role: 'assistant',
+@@ -241,7 +252,7 @@
+       </Section>
+     );
+
+-    uiStream.append(answerSection);
++    uiStream.update(answerSection);
+
+     const relatedQueries = { items: [] };
diff --git a/bun.lock b/bun.lock
index 907bd01f..12913e2a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "QCX",
@@ -61,7 +62,7 @@
         "lottie-react": "^2.4.1",
         "lucide-react": "^0.507.0",
         "mapbox-gl": "^3.11.0",
-        "next": "15.3.6",
+        "next": "15.3.8",
         "next-themes": "^0.3.0",
         "open-codex": "^0.1.30",
         "pg": "^8.16.2",
@@ -401,7 +402,7 @@
 
     "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@0.2.12", "", { "dependencies": { "@emnapi/core": "^1.4.3", "@emnapi/runtime": "^1.4.3", "@tybys/wasm-util": "^0.10.0" } }, "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ=="],
 
-    "@next/env": ["@next/env@15.3.6", "", {}, "sha512-/cK+QPcfRbDZxmI/uckT4lu9pHCfRIPBLqy88MhE+7Vg5hKrEYc333Ae76dn/cw2FBP2bR/GoK/4DU+U7by/Nw=="],
+    "@next/env": ["@next/env@15.3.8", "", {}, "sha512-SAfHg0g91MQVMPioeFeDjE+8UPF3j3BvHjs8ZKJAUz1BG7eMPvfCKOAgNWJ6s1MLNeP6O2InKQRTNblxPWuq+Q=="],
 
     "@next/eslint-plugin-next": ["@next/eslint-plugin-next@14.2.35", "", { "dependencies": { "glob": "10.3.10" } }, "sha512-Jw9A3ICz2183qSsqwi7fgq4SBPiNfmOLmTPXKvlnzstUwyvBrtySiY+8RXJweNAs9KThb1+bYhZh9XWcNOr2zQ=="],
 
@@ -1939,7 +1940,7 @@
 
     "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="],
 
-    "next": ["next@15.3.6", "", { "dependencies": { "@next/env": "15.3.6", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.3.5", "@next/swc-darwin-x64": "15.3.5", "@next/swc-linux-arm64-gnu": "15.3.5", "@next/swc-linux-arm64-musl": "15.3.5", "@next/swc-linux-x64-gnu": "15.3.5", "@next/swc-linux-x64-musl": "15.3.5", "@next/swc-win32-arm64-msvc": "15.3.5", "@next/swc-win32-x64-msvc": "15.3.5", "sharp": "^0.34.1" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-oI6D1zbbsh6JzzZFDCSHnnx6Qpvd1fSkVJu/5d8uluqnxzuoqtodVZjYvNovooznUq8udSAiKp7MbwlfZ8Gm6w=="],
+    "next": ["next@15.3.8", "", { "dependencies": { "@next/env": "15.3.8", "@swc/counter": "0.1.3", "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" }, "optionalDependencies": { "@next/swc-darwin-arm64": "15.3.5", "@next/swc-darwin-x64": "15.3.5", "@next/swc-linux-arm64-gnu": "15.3.5", "@next/swc-linux-arm64-musl": "15.3.5", "@next/swc-linux-x64-gnu": "15.3.5", "@next/swc-linux-x64-musl": "15.3.5", "@next/swc-win32-arm64-msvc": "15.3.5", "@next/swc-win32-x64-msvc": "15.3.5", "sharp": "^0.34.1" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "optionalPeers": ["@opentelemetry/api", "@playwright/test", "babel-plugin-react-compiler", "sass"], "bin": { "next": "dist/bin/next" } }, "sha512-L+4c5Hlr84fuaNADZbB9+ceRX9/CzwxJ+obXIGHupboB/Q1OLbSUapFs4bO8hnS/E6zV/JDX7sG1QpKVR2bguA=="],
 
     "next-themes": ["next-themes@0.3.0", "", { "peerDependencies": { "react": "^16.8 || ^17 || ^18", "react-dom": "^16.8 || ^17 || ^18" } }, "sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w=="],
 
diff --git a/components/chat-panel.tsx b/components/chat-panel.tsx
index d24077d7..39488b65 100644
--- a/components/chat-panel.tsx
+++ b/components/chat-panel.tsx
@@ -3,7 +3,6 @@
 import { useEffect, useState, useRef, ChangeEvent, forwardRef, useImperativeHandle, useCallback } from 'react'
 import type { AI, UIState } from '@/app/actions'
 import { useUIState, useActions, readStreamableValue } from 'ai/rsc'
-// Removed import of useGeospatialToolMcp as it's no longer used/available
 import { cn } from '@/lib/utils'
 import { UserMessage } from './user-message'
 import { Button } from './ui/button'
@@ -31,7 +30,6 @@ export interface ChatPanelRef {
 export const ChatPanel = forwardRef<ChatPanelRef, ChatPanelProps>(({ messages, input, setInput, onSuggestionsChange }, ref) => {
   const [, setMessages] = useUIState<typeof AI>()
   const { submit, clearChat } = useActions()
-  // Removed mcp instance as it's no longer passed to submit
   const { mapProvider } = useSettingsStore()
   const [isMobile, setIsMobile] = useState(false)
   const [selectedFile, setSelectedFile] = useState<File | null>(null)
@@ -117,6 +115,9 @@ export const ChatPanel = forwardRef<ChatPanelRef, ChatPanelProps>(({ messages, i
       formData.append('file', selectedFile)
     }
 
+    // Include drawn features in the form data
+    formData.append('drawnFeatures', JSON.stringify(mapData.drawnFeatures || []))
+
     setInput('')
     clearAttachment()
 
@@ -289,7 +290,6 @@ export const ChatPanel = forwardRef<ChatPanelRef, ChatPanelProps>(({ messages, i
           >
             <ArrowRight size={isMobile ? 18 : 20} />
           </Button>
-          {/* Suggestions are now handled by the parent component (chat.tsx) as an overlay */}
         </div>
       </form>
       {selectedFile && (
diff --git a/components/chat.tsx b/components/chat.tsx
index b74ab6cd..b73ae463 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -39,15 +39,17 @@ export function Chat({ id }: ChatProps) {
   const [showEmptyScreen, setShowEmptyScreen] = useState(false)
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [suggestions, setSuggestions] = useState<PartialRelated | null>(null)
-  const chatPanelRef = useRef<ChatPanelRef>(null);
+  const chatPanelRef = useRef<ChatPanelRef>(null)
+  const lastRefreshedMessageIdRef = useRef<string | null>(null)
+  const lastSyncedDataRef = useRef<string>('')
 
   const handleAttachment = () => {
-    chatPanelRef.current?.handleAttachmentClick();
-  };
+    chatPanelRef.current?.handleAttachmentClick()
+  }
 
   const handleMobileSubmit = () => {
-    chatPanelRef.current?.submitForm();
-  };
+    chatPanelRef.current?.submitForm()
+  }
   
   useEffect(() => {
     setShowEmptyScreen(messages.length === 0)
@@ -76,18 +78,16 @@ export function Chat({ id }: ChatProps) {
   }, [id, path, messages])
 
   useEffect(() => {
-    const lastMessage = aiState.messages[aiState.messages.length - 1];
-    if (lastMessage?.type === 'response' && lastMessage.id !== lastRefreshedMessageIdRef.current) {
+    const lastResponse = [...aiState.messages].reverse().find(m => m.type === 'response')
+    if (lastResponse && lastResponse.id !== lastRefreshedMessageIdRef.current) {
       // Refresh the page to chat history updates
-      lastRefreshedMessageIdRef.current = lastMessage.id;
+      lastRefreshedMessageIdRef.current = lastResponse.id
       router.refresh()
     }
-  }, [aiState, router])
+  }, [aiState.messages, router])
 
   // Get mapData to access drawnFeatures
-  const { mapData } = useMapData();
-  const lastSyncedDataRef = useRef<string>('');
-  const lastRefreshedMessageIdRef = useRef<string | null>(null);
+  const { mapData } = useMapData()
 
   useEffect(() => {
     if (isSubmitting) {
@@ -103,19 +103,38 @@ export function Chat({ id }: ChatProps) {
         drawnFeatures: mapData.drawnFeatures || [],
         cameraState: mapData.cameraState,
         uploadedGeoJson: (mapData.uploadedGeoJson || []).map(item => ({ id: item.id, visible: item.visible }))
-      });
+      })
 
       if (currentData !== lastSyncedDataRef.current) {
-        console.log('Chat.tsx: map data changed, calling updateDrawingContext');
-        lastSyncedDataRef.current = currentData;
+        console.log('Chat.tsx: map data changed, calling updateDrawingContext')
+        lastSyncedDataRef.current = currentData
         updateDrawingContext(id, {
           drawnFeatures: mapData.drawnFeatures || [],
           cameraState: mapData.cameraState,
           uploadedGeoJson: mapData.uploadedGeoJson || []
-        });
+        })
       }
     }
-  }, [id, mapData.drawnFeatures, mapData.cameraState, mapData.uploadedGeoJson]);
+  }, [id, mapData.drawnFeatures, mapData.cameraState, mapData.uploadedGeoJson])
+
+  const renderSuggestions = () => {
+    if (!suggestions) return null;
+    return (
+      <div className="absolute inset-0 z-20 flex flex-col items-start p-4">
+        <SuggestionsDropdown
+          suggestions={suggestions}
+          onSelect={query => {
+            setInput(query)
+            setSuggestions(null)
+            // Use a small timeout to ensure state update before submission
+            setIsSubmitting(true)
+          }}
+          onClose={() => setSuggestions(null)}
+          className="relative bottom-auto mb-0 w-full shadow-none border-none bg-transparent"
+        />
+      </div>
+    );
+  };
 
   // Mobile layout
   if (isMobile) {
@@ -141,41 +160,27 @@ export function Chat({ id }: ChatProps) {
         <div className="mobile-chat-messages-area relative">
           {isCalendarOpen ? (
             <CalendarNotepad chatId={id} />
-          ) : showEmptyScreen ? (
+          ) : (
             <div className="relative w-full h-full">
               <div className={cn("transition-all duration-300", suggestions ? "blur-md pointer-events-none" : "")}>
-                <EmptyScreen
-                  submitMessage={message => {
-                    setInput(message)
-                    setIsSubmitting(true)
-                  }}
-                />
-              </div>
-              {suggestions && (
-                <div className="absolute inset-0 z-20 flex flex-col items-start p-4">
-                  <SuggestionsDropdown
-                    suggestions={suggestions}
-                    onSelect={query => {
-                      setInput(query)
-                      setSuggestions(null)
-                      // Use a small timeout to ensure state update before submission
-                      setTimeout(() => {
-                        setIsSubmitting(true)
-                      }, 0)
+                {showEmptyScreen ? (
+                  <EmptyScreen
+                    submitMessage={message => {
+                      setInput(message)
+                      setIsSubmitting(true)
                     }}
-                    onClose={() => setSuggestions(null)}
-                    className="relative bottom-auto mb-0 w-full shadow-none border-none bg-transparent"
                   />
-                </div>
-              )}
+                ) : (
+                  <ChatMessages messages={messages} />
+                )}
+              </div>
+              {renderSuggestions()}
             </div>
-          ) : (
-            <ChatMessages messages={messages} />
           )}
         </div>
         </div>
       </>
-    );
+    )
   }
 
   // Desktop layout
@@ -195,38 +200,20 @@ export function Chat({ id }: ChatProps) {
               setInput={setInput} 
               onSuggestionsChange={setSuggestions}
             />
-            <div className="relative">
-              {showEmptyScreen ? (
-                <>
-                  <div className={cn("transition-all duration-300", suggestions ? "blur-md pointer-events-none" : "")}>
-                    <EmptyScreen
-                      submitMessage={message => {
-                        setInput(message)
-                        setIsSubmitting(true)
-                      }}
-                    />
-                  </div>
-                  {suggestions && (
-                    <div className="absolute inset-0 z-20 flex flex-col items-start p-4">
-                      <SuggestionsDropdown
-                        suggestions={suggestions}
-                        onSelect={query => {
-                          setInput(query)
-                          setSuggestions(null)
-                          // Use a small timeout to ensure state update before submission
-                          setTimeout(() => {
-                            setIsSubmitting(true)
-                          }, 0)
-                        }}
-                        onClose={() => setSuggestions(null)}
-                        className="relative bottom-auto mb-0 w-full shadow-none border-none bg-transparent"
-                      />
-                    </div>
-                  )}
-                </>
-              ) : (
-                <ChatMessages messages={messages} />
-              )}
+            <div className="relative min-h-[100px]">
+              <div className={cn("transition-all duration-300", suggestions ? "blur-md pointer-events-none" : "")}>
+                {showEmptyScreen ? (
+                  <EmptyScreen
+                    submitMessage={message => {
+                      setInput(message)
+                      setIsSubmitting(true)
+                    }}
+                  />
+                ) : (
+                  <ChatMessages messages={messages} />
+                )}
+              </div>
+              {renderSuggestions()}
             </div>
           </>
         )}
@@ -239,5 +226,5 @@ export function Chat({ id }: ChatProps) {
         </div>
       </div>
     </>
-  );
+  )
 }
diff --git a/components/followup-panel.tsx b/components/followup-panel.tsx
index 08642530..a11f585f 100644
--- a/components/followup-panel.tsx
+++ b/components/followup-panel.tsx
@@ -4,16 +4,16 @@ import { useState } from 'react'
 import { Button } from './ui/button'
 import { Input } from './ui/input'
 import { useActions, useUIState } from 'ai/rsc'
-// Removed import of useGeospatialToolMcp as it's no longer used/available
 import type { AI } from '@/app/actions'
 import { UserMessage } from './user-message'
 import { ArrowRight } from 'lucide-react'
+import { useMapData } from './map/map-data-context'
 
 export function FollowupPanel() {
   const [input, setInput] = useState('')
   const { submit } = useActions()
-  // Removed mcp instance as it's no longer passed to submit
   const [, setMessages] = useUIState<typeof AI>()
+  const { mapData } = useMapData()
 
   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
@@ -25,7 +25,9 @@ export function FollowupPanel() {
       component: <UserMessage content={input} />
     }
 
-    // Removed mcp argument from submit call
+    // Include drawn features in the form data
+    formData.append('drawnFeatures', JSON.stringify(mapData.drawnFeatures || []))
+
     const responseMessage = await submit(formData)
     setMessages(currentMessages => [
       ...currentMessages,
diff --git a/components/header-search-button.tsx b/components/header-search-button.tsx
index 560a01df..6566a53e 100644
--- a/components/header-search-button.tsx
+++ b/components/header-search-button.tsx
@@ -73,7 +73,7 @@ export function HeaderSearchButton() {
         const { center, range } = mapData.cameraState
         const zoom = Math.round(Math.log2(40000000 / (range || 1)));
 
-        let staticMapUrl = `https://maps.googleapis.com/maps/api/staticmap?center=${center.lat},${center.lng}&zoom=${zoom}&size=640x480&maptype=satellite&key=${apiKey}`;
+        let staticMapUrl = `https://maps.googleapis.com/maps/api/staticmap?center=${center.lat},${center.lng}&zoom=${zoom}&size=640x480&scale=2&maptype=satellite&key=${apiKey}`;
 
         const response = await fetch(staticMapUrl);
         if (!response.ok) {
@@ -130,4 +130,4 @@ export function HeaderSearchButton() {
       {mobilePortal && createPortal(mobileButton, mobilePortal)}
     </>
   )
-}
\ No newline at end of file
+}
diff --git a/components/resolution-image.tsx b/components/resolution-image.tsx
new file mode 100644
index 00000000..69def4b8
--- /dev/null
+++ b/components/resolution-image.tsx
@@ -0,0 +1,60 @@
+/* eslint-disable @next/next/no-img-element */
+'use client'
+
+import React from 'react'
+import { Card, CardContent } from '@/components/ui/card'
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger
+} from '@/components/ui/dialog'
+import { motion } from 'framer-motion'
+import { cn } from '@/lib/utils'
+
+interface ResolutionImageProps {
+  src: string
+  className?: string
+  alt?: string
+}
+
+export function ResolutionImage({ src, className, alt = 'Map Imagery' }: ResolutionImageProps) {
+  if (!src) return null
+
+  return (
+    <div className={cn('mt-2 mb-4', className)}>
+      <Dialog>
+        <DialogTrigger asChild>
+          <motion.div
+            className="w-fit cursor-pointer relative glassmorphic overflow-hidden rounded-lg border bg-muted"
+            whileHover={{ scale: 1.02 }}
+            whileTap={{ scale: 0.98 }}
+          >
+            <Card className="border-none shadow-none bg-transparent">
+              <CardContent className="p-2">
+                <img
+                  src={src}
+                  alt={alt}
+                  className="max-w-xs max-h-64 rounded-md object-contain"
+                />
+              </CardContent>
+            </Card>
+          </motion.div>
+        </DialogTrigger>
+        <DialogContent className="sm:max-w-5xl max-h-[90vh] p-1 glassmorphic border-none">
+          <DialogHeader className="sr-only">
+            <DialogTitle>{alt}</DialogTitle>
+          </DialogHeader>
+          <div className="flex items-center justify-center h-full">
+            <img
+              src={src}
+              alt={`${alt} Full`}
+              className="h-auto w-full object-contain max-h-[85vh] rounded-md"
+            />
+          </div>
+        </DialogContent>
+      </Dialog>
+    </div>
+  )
+}
diff --git a/components/search-related.tsx b/components/search-related.tsx
index d4a58b08..a03901c5 100644
--- a/components/search-related.tsx
+++ b/components/search-related.tsx
@@ -1,19 +1,18 @@
 'use client'
 
-import React, { useEffect, useState } from 'react'
+import React from 'react'
 import { Button } from './ui/button'
 import { ArrowRight } from 'lucide-react'
 import {
   useActions,
   useStreamableValue,
   useUIState,
-  readStreamableValue,
   StreamableValue
 } from 'ai/rsc'
 import { AI } from '@/app/actions'
-// Removed import of useGeospatialToolMcp as it's no longer used/available
 import { UserMessage } from './user-message'
 import { PartialRelated } from '@/lib/schema/related'
+import { nanoid } from 'nanoid'
 
 export interface SearchRelatedProps {
   relatedQueries: StreamableValue<PartialRelated, any>
@@ -23,30 +22,18 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
   relatedQueries
 }) => {
   const { submit } = useActions()
-  // Removed mcp instance as it's no longer passed to submit
   const [, setMessages] = useUIState<typeof AI>()
-  const [data, error, pending] =
-    useStreamableValue<PartialRelated>(relatedQueries)
+  const [data] = useStreamableValue<PartialRelated>(relatedQueries)
 
-  const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault()
-    const formData = new FormData(event.currentTarget as HTMLFormElement)
-
-    // // Get the submitter of the form
-    const submitter = (event.nativeEvent as SubmitEvent)
-      .submitter as HTMLInputElement
-    let query = ''
-    if (submitter) {
-      formData.append(submitter.name, submitter.value)
-      query = submitter.value
-    }
+  const handleRelatedClick = async (query: string) => {
+    const formData = new FormData()
+    formData.append('related_query', query)
 
     const userMessage = {
-      id: Date.now(),
+      id: nanoid(),
       component: <UserMessage content={query} />
     }
 
-    // Removed mcp argument from submit call
     const responseMessage = await submit(formData)
     setMessages(currentMessages => [
       ...currentMessages,
@@ -56,7 +43,7 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
   }
 
   return (
-    <form onSubmit={handleSubmit} className="flex flex-wrap">
+    <div className="flex flex-wrap">
       {data?.items
         ?.filter(item => item?.query !== '')
         .map((item, index) => (
@@ -65,15 +52,13 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
             <Button
               variant="link"
               className="flex-1 justify-start px-0 py-1 h-fit font-semibold text-accent-foreground/50 whitespace-normal text-left"
-              type="submit"
-              name={'related_query'}
-              value={item?.query}
+              onClick={() => handleRelatedClick(item?.query || '')}
             >
               {item?.query}
             </Button>
           </div>
         ))}
-    </form>
+    </div>
   )
 }
 
diff --git a/components_chat_patch.patch b/components_chat_patch.patch
new file mode 100644
index 00000000..17df116b
--- /dev/null
+++ b/components_chat_patch.patch
@@ -0,0 +1,24 @@
+--- components/chat.tsx
++++ components/chat.tsx
+@@ -156,10 +156,7 @@
+                   <EmptyScreen
+                     submitMessage={message => {
+                       setInput(message)
+-                      setTimeout(() => {
+-                        setIsSubmitting(true)
+-                      }, 0)
++                      setIsSubmitting(true)
+                     }}
+                   />
+                 ) : (
+@@ -198,10 +195,7 @@
+                   <EmptyScreen
+                     submitMessage={message => {
+                       setInput(message)
+-                      setTimeout(() => {
+-                        setIsSubmitting(true)
+-                      }, 0)
++                      setIsSubmitting(true)
+                     }}
+                   />
+                 ) : (
diff --git a/lib/agents/researcher.tsx b/lib/agents/researcher.tsx
index 72a5d737..ce801af4 100644
--- a/lib/agents/researcher.tsx
+++ b/lib/agents/researcher.tsx
@@ -12,15 +12,20 @@ import { BotMessage } from '@/components/message'
 import { getTools } from './tools'
 import { getModel } from '../utils'
 import { MapProvider } from '@/lib/store/settings'
+import { DrawnFeature } from './resolution-search'
 
 // This magic tag lets us write raw multi-line strings with backticks, arrows, etc.
 const raw = String.raw
 
-const getDefaultSystemPrompt = (date: string) => raw`
+const getDefaultSystemPrompt = (date: string, drawnFeatures?: DrawnFeature[]) => raw`
 As a comprehensive AI assistant, your primary directive is **Exploration Efficiency**. You must use the provided tools judiciously to gather information and formulate a response.
 
 Current date and time: ${date}.
 
+${drawnFeatures && drawnFeatures.length > 0 ? `The user has drawn the following features on the map for your reference:
+${drawnFeatures.map(f => `- ${f.type} with measurement ${f.measurement}`).join('\n')}
+Use these user-drawn areas/lines as primary areas of interest for your analysis if applicable to the query.` : ''}
+
 **Exploration Efficiency Directives:**
 1. **Tool First:** Always check if a tool can directly or partially answer the user's query. Use the most specific tool available.
 2. **Geospatial Priority:** For any query involving locations, places, addresses, geographical features, finding businesses, distances, or directions → you **MUST** use the 'geospatialQueryTool'.
@@ -80,7 +85,8 @@ export async function researcher(
   streamText: ReturnType<typeof createStreamableValue<string>>,
   messages: CoreMessage[],
   mapProvider: MapProvider,
-  useSpecificModel?: boolean
+  useSpecificModel?: boolean,
+  drawnFeatures?: DrawnFeature[]
 ) {
   let fullResponse = ''
   let hasError = false
@@ -96,7 +102,7 @@ export async function researcher(
   const systemPromptToUse =
     dynamicSystemPrompt?.trim()
       ? dynamicSystemPrompt
-      : getDefaultSystemPrompt(currentDate)
+      : getDefaultSystemPrompt(currentDate, drawnFeatures)
 
   // Check if any message contains an image
   const hasImage = messages.some(message =>
diff --git a/lib/agents/resolution-search.tsx b/lib/agents/resolution-search.tsx
index 1acd0e01..737551e8 100644
--- a/lib/agents/resolution-search.tsx
+++ b/lib/agents/resolution-search.tsx
@@ -47,7 +47,7 @@ As a geospatial analyst, your task is to analyze the provided satellite image of
 The current local time at this location is ${localTime}.
 
 ${drawnFeatures && drawnFeatures.length > 0 ? `The user has drawn the following features on the map for your reference:
-${drawnFeatures.map(f => `- ${f.type} with measurement ${f.measurement}`).join('\n')}
+${drawnFeatures.map(f => `- ${f.type} (${f.measurement}): ${JSON.stringify(f.geometry)}`).join('\n')}
 Use these user-drawn areas/lines as primary areas of interest for your analysis.` : ''}
 
 Your analysis should be comprehensive and include the following components:
@@ -76,4 +76,4 @@ Analyze the user's prompt and the image to provide a holistic understanding of t
     messages: filteredMessages,
     schema: resolutionSearchSchema,
   })
-}
\ No newline at end of file
+}
diff --git a/lib/agents/tools/geospatial.tsx b/lib/agents/tools/geospatial.tsx
index 4f1d9e0f..178bde56 100644
--- a/lib/agents/tools/geospatial.tsx
+++ b/lib/agents/tools/geospatial.tsx
@@ -153,6 +153,15 @@ async function closeClient(client: McpClient | null) {
   }
 }
 
+/**
+ * Helper to generate a Google Static Map URL
+ */
+function getGoogleStaticMapUrl(latitude: number, longitude: number): string {
+  const apiKey = process.env.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY || process.env.GOOGLE_MAPS_API_KEY;
+  if (!apiKey) return '';
+  return `https://maps.googleapis.com/maps/api/staticmap?center=${latitude},${longitude}&zoom=15&size=640x480&scale=2&markers=color:red%7C${latitude},${longitude}&key=${apiKey}`;
+}
+
 /**
  * Main geospatial tool executor.
  */
@@ -270,13 +279,18 @@ Uses the Mapbox Search Box Text Search API endpoint to power searching for and g
             const { latitude, longitude } = place.coordinates;
             const place_name = place.displayName;
 
-            const mcpData = {
+            const mcpData: McpResponse = {
               location: {
                 latitude,
                 longitude,
                 place_name,
               },
             };
+
+            if (mapProvider === 'google') {
+              mcpData.mapUrl = getGoogleStaticMapUrl(latitude, longitude);
+            }
+
             feedbackMessage = `Found location: ${place_name}`;
             uiFeedbackStream.update(feedbackMessage);
             uiFeedbackStream.done();
@@ -417,6 +431,11 @@ Uses the Mapbox Search Box Text Search API endpoint to power searching for and g
       feedbackMessage = `Successfully processed ${queryType} query for: ${mcpData.location.place_name || JSON.stringify(params)}`;
       uiFeedbackStream.update(feedbackMessage);
 
+      // Enhance with Google Static Map URL if provider is google and we have coordinates
+      if (mapProvider === 'google' && mcpData.location.latitude && mcpData.location.longitude && !mcpData.mapUrl) {
+        mcpData.mapUrl = getGoogleStaticMapUrl(mcpData.location.latitude, mcpData.location.longitude);
+      }
+
     } catch (error: any) {
       toolError = `Mapping service error: ${error.message}`;
       uiFeedbackStream.update(toolError);
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
index 64e8a305..f9b7eeb5 100644
--- a/lib/utils/index.ts
+++ b/lib/utils/index.ts
@@ -1,10 +1,8 @@
 import { type ClassValue, clsx } from 'clsx'
 import { twMerge } from 'tailwind-merge'
 import { getSelectedModel } from '@/lib/actions/users'
-import { openai } from '@ai-sdk/openai'
 import { createOpenAI } from '@ai-sdk/openai'
 import { createGoogleGenerativeAI } from '@ai-sdk/google'
-import { createAnthropic } from '@ai-sdk/anthropic'
 import { createAmazonBedrock } from '@ai-sdk/amazon-bedrock'
 import { createXai } from '@ai-sdk/xai';
 import { v4 as uuidv4 } from 'uuid';
diff --git a/package.json b/package.json
index 77546007..ca1aed72 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "lottie-react": "^2.4.1",
     "lucide-react": "^0.507.0",
     "mapbox-gl": "^3.11.0",
-    "next": "15.3.6",
+    "next": "15.3.8",
     "next-themes": "^0.3.0",
     "open-codex": "^0.1.30",
     "pg": "^8.16.2",
@@ -116,4 +116,4 @@
     "tailwindcss": "^3.4.17",
     "typescript": "^5.8.3"
   }
-}
\ No newline at end of file
+}