2 files changed, 10 insertions, 4 deletions
diff --git a/apps/web/app/dashboard/lists/[listId]/page.tsx b/apps/web/app/dashboard/lists/[listId]/page.tsx
index 4e35c377..b9a26053 100644
--- a/apps/web/app/dashboard/lists/[listId]/page.tsx
+++ b/apps/web/app/dashboard/lists/[listId]/page.tsx
@@ -1,6 +1,6 @@
 import { notFound, redirect } from "next/navigation";
+import BookmarksGrid from "@/components/dashboard/bookmarks/BookmarksGrid";
 import DeleteListButton from "@/components/dashboard/lists/DeleteListButton";
-import ListView from "@/components/dashboard/lists/ListView";
 import { api } from "@/server/api/client";
 import { getServerAuthSession } from "@/server/auth";
 import { TRPCError } from "@trpc/server";
@@ -27,7 +27,10 @@ export default async function ListPage({
     throw e;
   }
 
-  const bookmarks = await api.bookmarks.getBookmarks({ ids: list.bookmarks });
+  const bookmarks = await api.bookmarks.getBookmarks({
+    listId: list.id,
+    archived: false,
+  });
 
   return (
     <div className="container flex flex-col gap-3">
@@ -38,7 +41,10 @@ export default async function ListPage({
         <DeleteListButton list={list} />
       </div>
       <hr />
-      <ListView list={list} bookmarks={bookmarks.bookmarks} />
+      <BookmarksGrid
+        query={{ listId: list.id, archived: false }}
+        bookmarks={bookmarks.bookmarks}
+      />
     </div>
   );
 }
diff --git a/apps/web/app/dashboard/tags/[tagName]/page.tsx b/apps/web/app/dashboard/tags/[tagName]/page.tsx
index 0c5c1c1f..dee29c5e 100644
--- a/apps/web/app/dashboard/tags/[tagName]/page.tsx
+++ b/apps/web/app/dashboard/tags/[tagName]/page.tsx
@@ -28,8 +28,8 @@ export default async function TagPage({
   }
 
   const query = {
-    ids: tag.bookmarks,
     archived: false,
+    tagId: tag.id,
   };
 
   const bookmarks = await api.bookmarks.getBookmarks(query);