diff --git a/packages/modules/b2c-core/src/api/admin/notifications/route.ts b/packages/modules/b2c-core/src/api/admin/notifications/route.ts
index 9dd7241fa..d896de50a 100644
--- a/packages/modules/b2c-core/src/api/admin/notifications/route.ts
+++ b/packages/modules/b2c-core/src/api/admin/notifications/route.ts
@@ -1,9 +1,9 @@
 import {
   AuthenticatedMedusaRequest,
   MedusaResponse,
-  refetchEntities
-} from '@medusajs/framework/http'
-import { HttpTypes } from '@medusajs/framework/types'
+} from "@medusajs/framework/http";
+import { HttpTypes } from "@medusajs/framework/types";
+import { ContainerRegistrationKeys } from "@medusajs/framework/utils";
 
 /**
  * @oas [get] /admin/notifications
@@ -61,18 +61,19 @@ export const GET = async (
   req: AuthenticatedMedusaRequest<HttpTypes.AdminNotificationListParams>,
   res: MedusaResponse<HttpTypes.AdminNotificationListResponse>
 ) => {
-  const { rows: notifications, metadata } = await refetchEntities(
-    'notification',
-    { ...req.filterableFields, channel: 'feed' },
-    req.scope,
-    req.queryConfig.fields,
-    req.queryConfig.pagination
-  )
+  const query = req.scope.resolve(ContainerRegistrationKeys.QUERY);
+
+  const { data: notifications, metadata } = await query.graph({
+    entity: "notification",
+    fields: req.queryConfig.fields,
+    filters: { ...req.filterableFields, channel: "feed" },
+    pagination: req.queryConfig.pagination,
+  });
 
   res.json({
     notifications,
-    count: metadata.count,
-    offset: metadata.skip,
-    limit: metadata.take
-  })
-}
+    count: metadata?.count || 0,
+    offset: metadata?.skip || 0,
+    limit: metadata?.take || 0,
+  });
+};
diff --git a/packages/modules/b2c-core/src/api/vendor/product-tags/route.ts b/packages/modules/b2c-core/src/api/vendor/product-tags/route.ts
index f93a01fac..d42f2efd4 100644
--- a/packages/modules/b2c-core/src/api/vendor/product-tags/route.ts
+++ b/packages/modules/b2c-core/src/api/vendor/product-tags/route.ts
@@ -1,8 +1,8 @@
 import {
   AuthenticatedMedusaRequest,
   MedusaResponse,
-  refetchEntities
-} from '@medusajs/framework'
+} from "@medusajs/framework";
+import { ContainerRegistrationKeys } from "@medusajs/framework/utils";
 
 /**
  * @oas [get] /vendor/product-tags
@@ -59,18 +59,18 @@ export const GET = async (
   req: AuthenticatedMedusaRequest,
   res: MedusaResponse
 ) => {
-  const { rows: product_tags, metadata } = await refetchEntities(
-    'product_tag',
-    req.filterableFields,
-    req.scope,
-    req.queryConfig.fields,
-    req.queryConfig.pagination
-  )
+  const query = req.scope.resolve(ContainerRegistrationKeys.QUERY);
+  const { data: product_tags, metadata } = await query.graph({
+    entity: "product_tag",
+    fields: req.queryConfig.fields,
+    filters: req.filterableFields,
+    pagination: req.queryConfig.pagination,
+  });
 
   res.json({
     product_tags,
-    count: metadata?.count,
-    offset: metadata?.skip,
-    limit: metadata?.take
-  })
-}
+    count: metadata?.count || 0,
+    offset: metadata?.skip || 0,
+    limit: metadata?.take || 0,
+  });
+};