diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index fccf633..f1571c5 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -5,7 +5,7 @@ import { PDFViewer } from './viewer/PDFViewer';
 import type { PDFViewerRef } from './viewer/PDFViewer';
 import type { Annotation } from './viewer/AnnotationLayer';
 import { gatewayService } from './lib/gatewayService';
-import type { DocumentInfo } from './lib/gatewayService';
+import type { DocumentInfo, SearchResult } from './lib/gatewayService';
 import { wasmLoader } from './lib/wasmLoader';
 import './App.css';
 
@@ -28,16 +28,30 @@ function App() {
 
   // Search State
   const [searchQuery, setSearchQuery] = useState('');
+  const [searchResults, setSearchResults] = useState<SearchResult[]>([]);
   const [searchResultCount, setSearchResultCount] = useState(0);
   const [searchCurrentMatch, setSearchCurrentMatch] = useState(0);
 
-  const handleSearch = (query: string) => {
+  const handleSearch = async (query: string) => {
     setSearchQuery(query);
-    // Mock search results for Phase 0
-    if (query) {
-      setSearchResultCount(5);
+    if (!query || !selectedDocId) {
+      setSearchResults([]);
+      setSearchResultCount(0);
       setSearchCurrentMatch(0);
-    } else {
+      return;
+    }
+
+    try {
+      const results = await gatewayService.searchDocument(selectedDocId, query);
+      setSearchResults(results);
+      setSearchResultCount(results.length);
+      setSearchCurrentMatch(0);
+      if (results.length > 0) {
+        viewerRef.current?.scrollToPage(results[0].pageIndex);
+      }
+    } catch (err) {
+      console.error("Search failed", err);
+      setSearchResults([]);
       setSearchResultCount(0);
       setSearchCurrentMatch(0);
     }
@@ -45,13 +59,17 @@ function App() {
 
   const handleSearchNext = () => {
     if (searchResultCount > 0) {
-      setSearchCurrentMatch((prev) => (prev + 1) % searchResultCount);
+      const nextMatch = (searchCurrentMatch + 1) % searchResultCount;
+      setSearchCurrentMatch(nextMatch);
+      viewerRef.current?.scrollToPage(searchResults[nextMatch].pageIndex);
     }
   };
 
   const handleSearchPrev = () => {
     if (searchResultCount > 0) {
-      setSearchCurrentMatch((prev) => (prev - 1 + searchResultCount) % searchResultCount);
+      const prevMatch = (searchCurrentMatch - 1 + searchResultCount) % searchResultCount;
+      setSearchCurrentMatch(prevMatch);
+      viewerRef.current?.scrollToPage(searchResults[prevMatch].pageIndex);
     }
   };
 
@@ -310,11 +328,15 @@ function App() {
             ref={viewerRef}
             documentId={activeDoc.id}
             totalPages={activeDoc.totalPages}
+            pageWidth={activeDoc.pageWidth}
+            pageHeight={activeDoc.pageHeight}
             zoom={zoom}
             pagesInfo={activeDoc.pages}
             activeTool={activeTool}
             annotations={annotations}
             searchQuery={searchQuery}
+            searchResults={searchResults}
+            searchCurrentMatch={searchCurrentMatch}
             onAnnotationAdded={handleAnnotationAdded}
             onPageVisible={setCurrentPage}
           />
diff --git a/frontend/src/components/Toolbar.tsx b/frontend/src/components/Toolbar.tsx
index 943d30f..ceca69f 100644
--- a/frontend/src/components/Toolbar.tsx
+++ b/frontend/src/components/Toolbar.tsx
@@ -160,6 +160,14 @@ export const Toolbar: React.FC<ToolbarProps> = ({
             Highlight
           </button>
 
+          <button
+            onClick={() => onActiveToolChange('draw')}
+            className={`tool-btn draw ${activeTool === 'draw' ? 'active' : ''}`}
+            title="Freehand Ink Pen"
+          >
+            Draw
+          </button>
+
           <button
             onClick={() => onActiveToolChange('signature')}
             className={`tool-btn signature ${activeTool === 'signature' ? 'active' : ''}`}
diff --git a/frontend/src/index.css b/frontend/src/index.css
index ce98c6f..6bfe9b0 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -313,6 +313,12 @@ body {
   border: 1px solid rgba(245, 158, 11, 0.4);
 }
 
+.tool-btn.draw.active {
+  background: rgba(59, 130, 246, 0.2);
+  color: #60a5fa;
+  border: 1px solid rgba(59, 130, 246, 0.4);
+}
+
 .tool-btn.signature.active {
   background: rgba(79, 70, 229, 0.2);
   color: #c7d2fe;
diff --git a/frontend/src/lib/gatewayService.ts b/frontend/src/lib/gatewayService.ts
index 708b7f5..aab2eb8 100644
--- a/frontend/src/lib/gatewayService.ts
+++ b/frontend/src/lib/gatewayService.ts
@@ -16,6 +16,8 @@ export interface DocumentInfo {
   filename: string;
   sizeBytes: number;
   totalPages: number;
+  pageWidth: number;
+  pageHeight: number;
   uploadedAt: string;
   status: 'processing' | 'ready' | 'error';
   pages?: PageInfo[];
@@ -28,7 +30,20 @@ export interface RenderParams {
   rotation: number;
 }
 
-import type { Point, Rect } from './coordinateMapping';
+import type { Point } from './coordinateMapping';
+
+export interface SearchRect {
+  x: number;
+  y: number;
+  w: number;
+  h: number;
+}
+
+export interface SearchResult {
+  pageIndex: number;
+  rects: SearchRect[];
+  text: string;
+}
 
 export interface TextOverlayData {
   text: string;
@@ -186,6 +201,8 @@ class GatewayService {
             filename: file.name,
             sizeBytes: file.size,
             totalPages: 5, // Mocked total pages
+            pageWidth: 612,
+            pageHeight: 792,
             uploadedAt: new Date().toISOString(),
             status: 'ready',
             pages: Array.from({ length: 5 }, (_, i) => ({ index: i, width: 612, height: 792 })),
@@ -264,6 +281,21 @@ class GatewayService {
     return response.json();
   }
 
+  async searchDocument(documentId: string, query: string): Promise<SearchResult[]> {
+    if (!query) return [];
+    
+    const urlParams = new URLSearchParams({ q: query });
+    const response = await fetch(`${this.baseUrl}/documents/${documentId}/search?${urlParams.toString()}`);
+    
+    if (response.status === 501) {
+      // Return mock empty results if backend isn't available
+      return [];
+    }
+    
+    if (!response.ok) throw new Error(`Failed to search document: ${response.statusText}`);
+    return response.json();
+  }
+
   private getMockDocuments(): DocumentInfo[] {
     return [
       {
@@ -271,6 +303,8 @@ class GatewayService {
         filename: 'Quarterly_Financial_Report.pdf',
         sizeBytes: 1024 * 1024 * 3.4, // 3.4MB
         totalPages: 12,
+        pageWidth: 612,
+        pageHeight: 792,
         uploadedAt: new Date(Date.now() - 1000 * 60 * 60 * 3).toISOString(),
         status: 'ready',
         pages: Array.from({ length: 12 }, (_, i) => ({ index: i, width: 612, height: 792 })),
@@ -280,6 +314,8 @@ class GatewayService {
         filename: 'Engineering_Specification_v4.pdf',
         sizeBytes: 1024 * 1024 * 18.2, // 18.2MB
         totalPages: 54,
+        pageWidth: 612,
+        pageHeight: 792,
         uploadedAt: new Date(Date.now() - 1000 * 60 * 60 * 24 * 2).toISOString(),
         status: 'ready',
         pages: Array.from({ length: 54 }, (_, i) => ({ index: i, width: 612, height: 792 })),
@@ -289,6 +325,8 @@ class GatewayService {
         filename: 'Tenant_Lease_Agreement_Final.pdf',
         sizeBytes: 1024 * 245, // 245KB
         totalPages: 4,
+        pageWidth: 612,
+        pageHeight: 792,
         uploadedAt: new Date(Date.now() - 1000 * 60 * 45).toISOString(),
         status: 'ready',
         pages: Array.from({ length: 4 }, (_, i) => ({ index: i, width: 612, height: 792 })),
diff --git a/frontend/src/lib/wasmLoader.ts b/frontend/src/lib/wasmLoader.ts
index 0af2143..899b335 100644
--- a/frontend/src/lib/wasmLoader.ts
+++ b/frontend/src/lib/wasmLoader.ts
@@ -26,7 +26,8 @@ class WasmLoader {
     try {
       // Dynamic import from the public folder / static route
       // @ts-ignore
-      const createModule = (await import(/* @vite-ignore */ '/pdfengine.mjs')).default;
+      const moduleUrl = (await import('/pdfengine.mjs?url')).default;
+      const createModule = (await import(/* @vite-ignore */ moduleUrl)).default;
       const Module = await createModule({
         locateFile: (path: string) => {
           if (path.endsWith('.wasm')) {
diff --git a/frontend/src/viewer/AnnotationLayer.tsx b/frontend/src/viewer/AnnotationLayer.tsx
index 994f69f..4557a18 100644
--- a/frontend/src/viewer/AnnotationLayer.tsx
+++ b/frontend/src/viewer/AnnotationLayer.tsx
@@ -3,11 +3,12 @@ import type { Rect } from '../lib/coordinateMapping';
 
 export interface Annotation {
   id: string;
-  type: 'highlight' | 'signature' | 'strikeout' | 'comment';
+  type: 'highlight' | 'signature' | 'strikeout' | 'comment' | 'ink';
   bbox: Rect;
   color?: string;
   author: string;
   content?: string;
+  paths?: { x: number; y: number }[][];
 }
 
 interface AnnotationLayerProps {
@@ -59,6 +60,23 @@ export const AnnotationLayer: React.FC<AnnotationLayerProps> = ({
             />
           );
         })}
+        
+      {/* Ink Annotations */}
+      <svg 
+        style={{ position: 'absolute', top: 0, left: 0, width: '100%', height: '100%', pointerEvents: 'none' }}
+      >
+        {annotations
+          .filter((anno) => anno.type === 'ink' && anno.paths)
+          .map((anno) => (
+            <g key={anno.id} stroke={anno.color || '#3b82f6'} strokeWidth={2 * zoom} fill="none" strokeLinecap="round" strokeLinejoin="round">
+              {anno.paths!.map((path, i) => {
+                if (path.length === 0) return null;
+                const d = path.map((pt, j) => `${j === 0 ? 'M' : 'L'} ${pt.x * zoom} ${pt.y * zoom}`).join(' ');
+                return <path key={i} d={d} />;
+              })}
+            </g>
+          ))}
+      </svg>
     </div>
   );
 };
diff --git a/frontend/src/viewer/OverlayLayer.tsx b/frontend/src/viewer/OverlayLayer.tsx
index e016955..1756883 100644
--- a/frontend/src/viewer/OverlayLayer.tsx
+++ b/frontend/src/viewer/OverlayLayer.tsx
@@ -1,11 +1,13 @@
-import React from 'react';
+import React, { useState, useRef } from 'react';
+import type { Annotation } from './AnnotationLayer';
 
 interface OverlayLayerProps {
   pageIndex: number;
   width: number;
   height: number;
   activeTool: string;
-  onDrawStroke?: (path: string) => void;
+  zoom: number;
+  onAnnotationAdded?: (anno: Annotation) => void;
 }
 
 export const OverlayLayer: React.FC<OverlayLayerProps> = ({
@@ -13,11 +15,70 @@ export const OverlayLayer: React.FC<OverlayLayerProps> = ({
   width,
   height,
   activeTool,
+  zoom,
+  onAnnotationAdded,
 }) => {
+  const [isDrawing, setIsDrawing] = useState(false);
+  const [currentPath, setCurrentPath] = useState<{ x: number; y: number }[]>([]);
+  const svgRef = useRef<SVGSVGElement>(null);
+
+  const getCoordinates = (e: React.MouseEvent | MouseEvent) => {
+    if (!svgRef.current) return { x: 0, y: 0 };
+    const rect = svgRef.current.getBoundingClientRect();
+    return {
+      x: (e.clientX - rect.left) / zoom,
+      y: (e.clientY - rect.top) / zoom,
+    };
+  };
+
+  const handlePointerDown = (e: React.PointerEvent) => {
+    if (activeTool !== 'draw') return;
+    setIsDrawing(true);
+    e.target.setPointerCapture?.(e.pointerId);
+    setCurrentPath([getCoordinates(e)]);
+  };
+
+  const handlePointerMove = (e: React.PointerEvent) => {
+    if (!isDrawing || activeTool !== 'draw') return;
+    setCurrentPath((prev) => [...prev, getCoordinates(e)]);
+  };
+
+  const handlePointerUp = (e: React.PointerEvent) => {
+    if (!isDrawing || activeTool !== 'draw') return;
+    setIsDrawing(false);
+    e.target.releasePointerCapture?.(e.pointerId);
+
+    if (currentPath.length > 1) {
+      // Calculate bounding box
+      const xs = currentPath.map(p => p.x);
+      const ys = currentPath.map(p => p.y);
+      const minX = Math.min(...xs);
+      const maxX = Math.max(...xs);
+      const minY = Math.min(...ys);
+      const maxY = Math.max(...ys);
+
+      const newAnno: Annotation = {
+        id: `anno_${Math.random().toString(36).substring(2, 11)}`,
+        type: 'ink',
+        bbox: {
+          x: minX,
+          y: minY,
+          width: maxX - minX,
+          height: maxY - minY,
+        },
+        author: 'Current User',
+        paths: [currentPath],
+        color: '#3b82f6', // Default blue color for now
+      };
+      onAnnotationAdded?.(newAnno);
+    }
+    setCurrentPath([]);
+  };
+
   return (
     <div
       className="overlay-layer"
-      style={{ width: `${width}px`, height: `${height}px` }}
+      style={{ width: `${width}px`, height: `${height}px`, pointerEvents: activeTool === 'draw' ? 'auto' : 'none' }}
     >
       {/* Signature overlay state indicator */}
       {activeTool === 'signature' && (
@@ -29,9 +90,30 @@ export const OverlayLayer: React.FC<OverlayLayerProps> = ({
       )}
       
       {activeTool === 'draw' && (
-        <div className="overlay-toast animate-pulse">
-          Freehand Ink Pen Enabled
-        </div>
+        <>
+          <div className="overlay-toast animate-pulse" style={{ pointerEvents: 'none' }}>
+            Freehand Ink Pen Enabled
+          </div>
+          <svg
+            ref={svgRef}
+            style={{ width: '100%', height: '100%', position: 'absolute', top: 0, left: 0, cursor: 'crosshair', touchAction: 'none' }}
+            onPointerDown={handlePointerDown}
+            onPointerMove={handlePointerMove}
+            onPointerUp={handlePointerUp}
+            onPointerCancel={handlePointerUp}
+          >
+            {currentPath.length > 0 && (
+              <path
+                d={currentPath.map((pt, i) => `${i === 0 ? 'M' : 'L'} ${pt.x * zoom} ${pt.y * zoom}`).join(' ')}
+                stroke="#3b82f6"
+                strokeWidth={2 * zoom}
+                fill="none"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+              />
+            )}
+          </svg>
+        </>
       )}
     </div>
   );
diff --git a/frontend/src/viewer/PDFViewer.tsx b/frontend/src/viewer/PDFViewer.tsx
index d2bccaf..9a949f6 100644
--- a/frontend/src/viewer/PDFViewer.tsx
+++ b/frontend/src/viewer/PDFViewer.tsx
@@ -7,16 +7,20 @@ import { OverlayLayer } from './OverlayLayer';
 import { SearchOverlayLayer } from './SearchOverlayLayer';
 import type { Rect } from '../lib/coordinateMapping';
 import { gatewayService } from '../lib/gatewayService';
-import type { PageInfo } from '../lib/gatewayService';
+import type { SearchResult, PageInfo } from '../lib/gatewayService';
 
 interface PDFViewerProps {
   documentId: string;
   totalPages: number;
+  pageWidth: number;
+  pageHeight: number;
   zoom: number;
   pagesInfo?: PageInfo[];
   activeTool: string;
   annotations: Annotation[];
   searchQuery?: string;
+  searchResults?: SearchResult[];
+  searchCurrentMatch?: number;
   onAnnotationAdded?: (anno: Annotation) => void;
   onPageVisible?: (pageIndex: number) => void;
 }
@@ -37,11 +41,15 @@ export interface PDFViewerRef {
 export const PDFViewer = React.forwardRef<PDFViewerRef, PDFViewerProps>(({
   documentId,
   totalPages,
+  pageWidth,
+  pageHeight,
   zoom,
   pagesInfo,
   activeTool,
   annotations,
   searchQuery,
+  searchResults,
+  searchCurrentMatch,
   onAnnotationAdded,
   onPageVisible,
 }, ref) => {
@@ -55,9 +63,10 @@ export const PDFViewer = React.forwardRef<PDFViewerRef, PDFViewerProps>(({
     setRenderedPages([]);
   }, [documentId]);
 
-  // Standard Page Dimensions: Letter size is 612x792 pt
-  const basePageWidth = 612;
-  const basePageHeight = 792;
+  // Use provided dimensions or fallback to Letter size
+  const basePageWidth = pageWidth || 612;
+  const basePageHeight = pageHeight || 792;
+
   const pageGap = 24; // space between pages
 
   // Calculate layout coordinates for all pages sequentially
@@ -303,6 +312,8 @@ export const PDFViewer = React.forwardRef<PDFViewerRef, PDFViewerProps>(({
                     width={page.width}
                     height={page.height}
                     activeTool={activeTool}
+                    zoom={zoom}
+                    onAnnotationAdded={onAnnotationAdded}
                   />
 
                   {/* Search highlights overlay */}
@@ -312,6 +323,8 @@ export const PDFViewer = React.forwardRef<PDFViewerRef, PDFViewerProps>(({
                     height={page.height}
                     zoom={zoom}
                     searchQuery={searchQuery || ''}
+                    searchResults={searchResults}
+                    searchCurrentMatch={searchCurrentMatch}
                   />
                 </>
               ) : (
diff --git a/frontend/src/viewer/SearchOverlayLayer.tsx b/frontend/src/viewer/SearchOverlayLayer.tsx
index 5500840..551f8e2 100644
--- a/frontend/src/viewer/SearchOverlayLayer.tsx
+++ b/frontend/src/viewer/SearchOverlayLayer.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import type { SearchResult } from '../lib/gatewayService';
 
 interface SearchOverlayLayerProps {
   pageIndex: number;
@@ -6,6 +7,8 @@ interface SearchOverlayLayerProps {
   height: number;
   zoom: number;
   searchQuery: string;
+  searchResults?: SearchResult[];
+  searchCurrentMatch?: number;
 }
 
 export const SearchOverlayLayer: React.FC<SearchOverlayLayerProps> = ({
@@ -14,47 +17,45 @@ export const SearchOverlayLayer: React.FC<SearchOverlayLayerProps> = ({
   height,
   zoom,
   searchQuery,
+  searchResults = [],
+  searchCurrentMatch = 0,
 }) => {
-  if (!searchQuery) return null;
+  if (!searchQuery || searchResults.length === 0) return null;
 
-  // Mock some search results based on the query for Phase 0/1
-  // We'll just generate deterministic-looking boxes so it looks like it found something
-  const mockResults = [];
-  const hash = searchQuery.length + pageIndex;
-  
-  if (hash % 3 !== 0) {
-    mockResults.push({
-      x: 100 * zoom,
-      y: (150 + hash * 10) * zoom,
-      width: 120 * zoom,
-      height: 18 * zoom,
-    });
-  }
-  if (hash % 2 === 0) {
-    mockResults.push({
-      x: 300 * zoom,
-      y: (250 + hash * 5) * zoom,
-      width: 80 * zoom,
-      height: 18 * zoom,
-    });
-  }
+  // Filter results for this specific page and keep track of global index
+  const pageMatches = searchResults
+    .map((result, globalIndex) => ({ ...result, globalIndex }))
+    .filter((result) => result.pageIndex === pageIndex);
+
+  if (pageMatches.length === 0) return null;
 
   return (
     <div
       className="absolute top-0 left-0 pointer-events-none z-20"
       style={{ width: `${width}px`, height: `${height}px` }}
     >
-      {mockResults.map((rect, idx) => (
-        <div
-          key={idx}
-          className="absolute bg-yellow-400/40 border border-yellow-500/60 rounded-sm"
-          style={{
-            left: `${rect.x}px`,
-            top: `${rect.y}px`,
-            width: `${rect.width}px`,
-            height: `${rect.height}px`,
-          }}
-        />
+      {pageMatches.map((match) => (
+        <React.Fragment key={match.globalIndex}>
+          {match.rects.map((rect, rectIdx) => {
+            const isActive = match.globalIndex === searchCurrentMatch;
+            return (
+              <div
+                key={rectIdx}
+                className={`absolute rounded-sm border ${
+                  isActive 
+                    ? 'bg-orange-500/50 border-orange-600/80 shadow-[0_0_8px_rgba(249,115,22,0.6)] z-30' 
+                    : 'bg-yellow-400/40 border-yellow-500/60'
+                }`}
+                style={{
+                  left: `${rect.x * zoom}px`,
+                  top: `${rect.y * zoom}px`,
+                  width: `${rect.w * zoom}px`,
+                  height: `${rect.h * zoom}px`,
+                }}
+              />
+            );
+          })}
+        </React.Fragment>
       ))}
     </div>
   );
diff --git a/gateway/app/routers/documents.py b/gateway/app/routers/documents.py
index 778d385..8dcffb6 100644
--- a/gateway/app/routers/documents.py
+++ b/gateway/app/routers/documents.py
@@ -23,11 +23,12 @@ class DocumentInfoResponse(BaseModel):
     filename: str
     sizeBytes: int
     totalPages: int
+    pageWidth: float
+    pageHeight: float
     uploadedAt: str
     status: str
     pages: list[PageInfoResponse] = []
 
-
 def make_document_response(d: dict) -> DocumentInfoResponse:
     pages_list = []
     if "doc_instance" in d:
@@ -43,6 +44,8 @@ def make_document_response(d: dict) -> DocumentInfoResponse:
         filename=d["filename"],
         sizeBytes=d["sizeBytes"],
         totalPages=d["totalPages"],
+        pageWidth=d.get("pageWidth", 612.0),
+        pageHeight=d.get("pageHeight", 792.0),
         uploadedAt=d["uploadedAt"],
         status=d["status"],
         pages=pages_list,
@@ -231,3 +234,95 @@ def get_document_fonts(
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
     except Exception as e:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
+
+class SearchRect(BaseModel):
+    x: float
+    y: float
+    w: float
+    h: float
+
+class SearchMatch(BaseModel):
+    pageIndex: int
+    rects: list[SearchRect]
+    text: str
+
+@router.get("/{document_id}/search", response_model=list[SearchMatch])
+def search_document(document_id: str, q: str) -> list[SearchMatch]:
+    if not engine.is_available():
+        raise HTTPException(
+            status_code=status.HTTP_501_NOT_IMPLEMENTED,
+            detail="Engine bridge (bindings/python) not yet available."
+        )
+    
+    if not q:
+        return []
+
+    doc_info = document_store.get_document(document_id)
+    if not doc_info:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Document not found")
+        
+    try:
+        doc = doc_info["doc_instance"]
+        matches = []
+        lower_query = q.lower()
+        query_len = len(lower_query)
+
+        for page_idx in range(doc.page_count):
+            page = doc.get_page(page_idx)
+            glyphs = page.extract_text_with_bounds()
+            if not glyphs:
+                continue
+
+            text_str = ""
+            char_to_glyph = []
+            for i, g in enumerate(glyphs):
+                s = g.get("text", "")
+                start_len = len(text_str)
+                text_str += s
+                for _ in range(len(text_str) - start_len):
+                    char_to_glyph.append(i)
+
+            lower_text = text_str.lower()
+            idx = 0
+            while True:
+                idx = lower_text.find(lower_query, idx)
+                if idx == -1:
+                    break
+                
+                start_glyph_idx = char_to_glyph[idx]
+                end_glyph_idx = char_to_glyph[idx + query_len - 1]
+                
+                rects = []
+                current_rect = None
+                
+                for g_idx in range(start_glyph_idx, end_glyph_idx + 1):
+                    g = glyphs[g_idx]
+                    dom_y = page.height - (g["y"] + g["h"])
+                    
+                    if current_rect is None:
+                        current_rect = {"x": g["x"], "y": dom_y, "w": g["w"], "h": g["h"]}
+                    else:
+                        if abs(dom_y - current_rect["y"]) < g.get("fontSize", 12) * 0.5:
+                            max_x = max(current_rect["x"] + current_rect["w"], g["x"] + g["w"])
+                            current_rect["w"] = max_x - current_rect["x"]
+                            current_rect["y"] = min(current_rect["y"], dom_y)
+                            current_rect["h"] = max(current_rect["h"], g["h"])
+                        else:
+                            rects.append(SearchRect(**current_rect))
+                            current_rect = {"x": g["x"], "y": dom_y, "w": g["w"], "h": g["h"]}
+                
+                if current_rect:
+                    rects.append(SearchRect(**current_rect))
+                    
+                matches.append(SearchMatch(
+                    pageIndex=page_idx,
+                    rects=rects,
+                    text=text_str[idx:idx + query_len]
+                ))
+                
+                idx += 1
+
+        return matches
+
+    except Exception as e:
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
diff --git a/gateway/app/services/store.py b/gateway/app/services/store.py
index b57ad3d..1147d9b 100644
--- a/gateway/app/services/store.py
+++ b/gateway/app/services/store.py
@@ -1,6 +1,6 @@
 import threading
 import uuid
-from datetime import UTC, datetime
+from datetime import UTC, datetime,timezone
 from typing import Any
 
 
@@ -12,12 +12,23 @@ class DocumentStore:
     def add_document(self, filename: str, bytes_data: bytes, doc_instance: Any) -> dict[str, Any]:
         doc_id = str(uuid.uuid4())
         uploaded_at = datetime.now(UTC).isoformat().replace("+00:00", "Z")
+        page_width = 612.0
+        page_height = 792.0
+        if doc_instance.page_count > 0:
+            try:
+                page_0 = doc_instance.get_page(0)
+                page_width = page_0.width
+                page_height = page_0.height
+            except Exception:
+                pass
 
         info = {
             "id": doc_id,
             "filename": filename,
             "sizeBytes": len(bytes_data),
             "totalPages": doc_instance.page_count,
+            "pageWidth": page_width,
+            "pageHeight": page_height,
             "uploadedAt": uploaded_at,
             "status": "ready",
             "doc_instance": doc_instance,
diff --git a/scripts/build_cpp.ps1 b/scripts/build_cpp.ps1
index 5502bf1..6dba036 100644
--- a/scripts/build_cpp.ps1
+++ b/scripts/build_cpp.ps1
@@ -43,19 +43,20 @@ if (-not $vcpkgRoot) {
     Write-Host "VCPKG_ROOT defaulted to: $vcpkgRoot" -ForegroundColor Yellow
 }
 
-$vcvars = "C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
-if (-not (Test-Path $vcvars)) {
+$vswhere = Join-Path ${env:ProgramFiles(x86)} 'Microsoft Visual Studio\Installer\vswhere.exe'
+if (Test-Path $vswhere) {
+    $vsPath = (& $vswhere -latest -prerelease -products * -property installationPath | Select-Object -First 1)
+    if ($vsPath) {
+        $vcvars = Join-Path $vsPath "VC\Auxiliary\Build\vcvars64.bat"
+    }
+}
+
+if (-not $vcvars -or -not (Test-Path $vcvars)) {
     $vcvars = "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
 }
 
 if (-not (Test-Path $vcvars)) {
-    $vswhere = Join-Path ${env:ProgramFiles(x86)} 'Microsoft Visual Studio\Installer\vswhere.exe'
-    if (Test-Path $vswhere) {
-        $vsPath = (& $vswhere -latest -prerelease -products * -property installationPath | Select-Object -First 1)
-        if ($vsPath) {
-            $vcvars = Join-Path $vsPath "VC\Auxiliary\Build\vcvars64.bat"
-        }
-    }
+    $vcvars = "C:\Program Files\Microsoft Visual Studio\18\Community\VC\Auxiliary\Build\vcvars64.bat"
 }
 
 if (-not (Test-Path $vcvars)) {