diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index b981c16..b9a63ea 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -40,8 +40,14 @@ export async function GET(request: NextRequest) {
     return NextResponse.json(results)
   } catch (error) {
     console.error('Search API error:', error)
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error'
+    console.error('Error details:', errorMessage)
+
     return NextResponse.json(
-      { error: 'Internal server error' },
+      {
+        error: 'Internal server error',
+        ...(process.env.NODE_ENV === 'development' && { details: errorMessage })
+      },
       { status: 500 }
     )
   }
diff --git a/lib/db.ts b/lib/db.ts
index 7c113d6..ee12080 100644
--- a/lib/db.ts
+++ b/lib/db.ts
@@ -128,7 +128,8 @@ export function searchRepositories(options: SearchOptions): PaginatedResults<Sea
       fts.rank,
       snippet(readmes_fts, 2, '<mark>', '</mark>', '...', 32) as snippet
     FROM readmes_fts fts
-    JOIN repositories r ON fts.rowid = r.id
+    JOIN readmes rm ON fts.rowid = rm.rowid
+    JOIN repositories r ON rm.repository_id = r.id
     LEFT JOIN awesome_lists al ON r.awesome_list_id = al.id
     WHERE readmes_fts MATCH ?
   `