From af2c240839a543eafd004a315e62b719f2649dcc Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Fri, 14 Nov 2025 13:05:34 -0500
Subject: [PATCH] fix some reviews

---
 backend/src/ee/services/pam-account/pam-account-service.ts  | 6 ++++--
 frontend/src/hooks/api/pam/queries.tsx                      | 1 +
 .../pam/PamAccountsPage/components/PamAccountsTable.tsx     | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/src/ee/services/pam-account/pam-account-service.ts b/backend/src/ee/services/pam-account/pam-account-service.ts
index 8050f702e..1c04b0553 100644
--- a/backend/src/ee/services/pam-account/pam-account-service.ts
+++ b/backend/src/ee/services/pam-account/pam-account-service.ts
@@ -369,14 +369,16 @@ export const pamAccountServiceFactory = ({
     if (canReadFolders && accountView === PamAccountView.Nested) {
       const { totalCount } = await pamFolderDAL.findByProjectId({
         projectId,
-        parentId: folderId
+        parentId: folderId,
+        search: params.search
       });
       totalFolderCount = totalCount;
     }
     const { totalCount: totalAccountCount } = await pamAccountDAL.findByProjectIdWithResourceDetails({
       projectId,
       folderId,
-      accountView
+      accountView,
+      search: params.search
     });
 
     const totalCount = totalFolderCount + totalAccountCount;
diff --git a/frontend/src/hooks/api/pam/queries.tsx b/frontend/src/hooks/api/pam/queries.tsx
index 7fcfb2569..a9f67897f 100644
--- a/frontend/src/hooks/api/pam/queries.tsx
+++ b/frontend/src/hooks/api/pam/queries.tsx
@@ -148,6 +148,7 @@ export const useListPamAccounts = (
 
       return data;
     },
+    placeholderData: (prev) => prev,
     ...options
   });
 };
diff --git a/frontend/src/pages/pam/PamAccountsPage/components/PamAccountsTable.tsx b/frontend/src/pages/pam/PamAccountsPage/components/PamAccountsTable.tsx
index df3ef308a..b31aaa330 100644
--- a/frontend/src/pages/pam/PamAccountsPage/components/PamAccountsTable.tsx
+++ b/frontend/src/pages/pam/PamAccountsPage/components/PamAccountsTable.tsx
@@ -228,6 +228,7 @@ export const PamAccountsTable = ({ projectId }: Props) => {
               <AccountViewToggle
                 value={accountView}
                 onChange={(e) => {
+                  setPage(1);
                   setAccountView(e);
                   navigate({
                     search: (prev) => ({