diff --git a/apps/web/src/app/api/collections/route.ts b/apps/web/src/app/api/collections/route.ts
index be47cd8..64e19e3 100644
--- a/apps/web/src/app/api/collections/route.ts
+++ b/apps/web/src/app/api/collections/route.ts
@@ -58,14 +58,23 @@ export async function GET(request: NextRequest): Promise<NextResponse<ApiRespons
       );
     }
 
-    // Parse pagination params
+    // Parse pagination and search params
     const searchParams = request.nextUrl.searchParams;
     const limit = Math.min(Math.max(Number.parseInt(searchParams.get('limit') || '20', 10), 1), 50);
     const offset = Math.max(Number.parseInt(searchParams.get('offset') || '0', 10), 0);
+    const search = searchParams.get('search')?.trim();
 
     // Fetch collections with tool count
     const collections = await prisma.collection.findMany({
-      where: { userId: session.user.id },
+      where: {
+        userId: session.user.id,
+        ...(search && {
+          OR: [
+            { name: { contains: search, mode: 'insensitive' } },
+            { description: { contains: search, mode: 'insensitive' } },
+          ],
+        }),
+      },
       include: {
         _count: { select: { tools: true } },
       },
diff --git a/apps/web/src/app/dashboard/agents/[id]/page.tsx b/apps/web/src/app/dashboard/agents/[id]/page.tsx
index bd6b3d8..e64ead3 100644
--- a/apps/web/src/app/dashboard/agents/[id]/page.tsx
+++ b/apps/web/src/app/dashboard/agents/[id]/page.tsx
@@ -209,10 +209,24 @@ export default function AgentDetailPage(): React.ReactElement {
       try {
         const response = await fetch(`/api/tools/search?q=${encodeURIComponent(query)}&limit=10`);
         const data = await response.json();
-        if (data.success) {
-          // Filter out tools already attached
+        if (data.success && data.results?.tools) {
+          // Filter out tools already attached and map to expected shape
           const attachedToolIds = new Set(agentTools.map((t) => t.toolId));
-          const filtered = (data.data || []).filter((t: SearchTool) => !attachedToolIds.has(t.id));
+          const filtered = data.results.tools
+            .filter((t: { id: string }) => !attachedToolIds.has(t.id))
+            .map(
+              (t: {
+                id: string;
+                name: string;
+                description: string | null;
+                package: { npmPackageName: string };
+              }) => ({
+                id: t.id,
+                name: t.name,
+                description: t.description,
+                npmPackageName: t.package.npmPackageName,
+              })
+            );
           setToolSearchResults(filtered);
         }
       } catch (err) {