diff --git a/app/components/content/division/list.vue b/app/components/content/division/list.vue
index 0acae66d..8d55db24 100644
--- a/app/components/content/division/list.vue
+++ b/app/components/content/division/list.vue
@@ -43,8 +43,8 @@ const {
   handleSearch,
   fetchData: getDivisionList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getDivisions({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getDivisions({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'division',
diff --git a/app/components/content/equipment/list.vue b/app/components/content/equipment/list.vue
index 61757da7..e51a7f9a 100644
--- a/app/components/content/equipment/list.vue
+++ b/app/components/content/equipment/list.vue
@@ -45,8 +45,8 @@ const {
   handleSearch,
   fetchData: getEquipmentList,
 } = usePaginatedList({
-  fetchFn: async ({ page }) => {
-    const result = await getMaterials({ search: searchInput.value, page })
+  fetchFn: async (params: any) => {
+    const result = await getMaterials({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'equipment',
diff --git a/app/components/content/installation/list.vue b/app/components/content/installation/list.vue
index 7c3986e0..cee19a42 100644
--- a/app/components/content/installation/list.vue
+++ b/app/components/content/installation/list.vue
@@ -44,8 +44,8 @@ const {
   handleSearch,
   fetchData: getInstallationList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getInstallations({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getInstallations({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'installation',
@@ -111,7 +111,7 @@ watch([recId, recAction], () => {
 })
 
 onMounted(async () => {
-  await getEncounterClassList();
+  await getEncounterClassList()
   await getInstallationList()
 })
 </script>
diff --git a/app/components/content/medicine-group/list.vue b/app/components/content/medicine-group/list.vue
index d56c4c49..d0d2c6d5 100644
--- a/app/components/content/medicine-group/list.vue
+++ b/app/components/content/medicine-group/list.vue
@@ -43,8 +43,8 @@ const {
   handleSearch,
   fetchData: getMedicineGroupList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getMedicineGroups({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getMedicineGroups({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'medicine-group',
diff --git a/app/components/content/medicine-method/list.vue b/app/components/content/medicine-method/list.vue
index 1de41ddc..8ff1bcf3 100644
--- a/app/components/content/medicine-method/list.vue
+++ b/app/components/content/medicine-method/list.vue
@@ -43,8 +43,8 @@ const {
   handleSearch,
   fetchData: getMedicineMethodList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getMedicineMethods({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getMedicineMethods({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'medicine-method',
diff --git a/app/components/content/medicine/list.vue b/app/components/content/medicine/list.vue
index 8df71a01..a690f781 100644
--- a/app/components/content/medicine/list.vue
+++ b/app/components/content/medicine/list.vue
@@ -54,8 +54,8 @@ const {
   handleSearch,
   fetchData: getMedicineList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getMedicines({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getMedicines({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'medicine',
diff --git a/app/components/content/specialist/list.vue b/app/components/content/specialist/list.vue
index b6d7048a..628f83ac 100644
--- a/app/components/content/specialist/list.vue
+++ b/app/components/content/specialist/list.vue
@@ -32,6 +32,7 @@ import { units, getUnitList } from '~/handlers/_shared.handler'
 
 // Services
 import { getSpecialists, getSpecialistDetail } from '~/services/specialist.service'
+import { get } from "@vueuse/core"
 
 const title = ref('')
 
@@ -44,8 +45,8 @@ const {
   handleSearch,
   fetchData: getSpecialistList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getSpecialists({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getSpecialists({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'specialist',
diff --git a/app/components/content/subspecialist/list.vue b/app/components/content/subspecialist/list.vue
index ec8520fd..78466bef 100644
--- a/app/components/content/subspecialist/list.vue
+++ b/app/components/content/subspecialist/list.vue
@@ -44,8 +44,8 @@ const {
   handleSearch,
   fetchData: getSubSpecialistList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getSubspecialists({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getSubspecialists({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'subspecialist',
diff --git a/app/components/content/tools/list.vue b/app/components/content/tools/list.vue
index 59091ab1..5de63c0a 100644
--- a/app/components/content/tools/list.vue
+++ b/app/components/content/tools/list.vue
@@ -44,8 +44,8 @@ const {
   handleSearch,
   fetchData: getToolsList,
 } = usePaginatedList({
-  fetchFn: async ({ page }) => {
-    const result = await getDevices({ search: searchInput.value, page })
+  fetchFn: async (params: any) => {
+    const result = await getDevices({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'device',
diff --git a/app/components/content/unit/list.vue b/app/components/content/unit/list.vue
index 0ecde4c5..3d474cb7 100644
--- a/app/components/content/unit/list.vue
+++ b/app/components/content/unit/list.vue
@@ -44,8 +44,8 @@ const {
   handleSearch,
   fetchData: getUnitList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getUnits({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getUnits({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'unit',
diff --git a/app/components/content/uom/list.vue b/app/components/content/uom/list.vue
index 6e6bda1b..383dbc3d 100644
--- a/app/components/content/uom/list.vue
+++ b/app/components/content/uom/list.vue
@@ -42,8 +42,8 @@ const {
   handleSearch,
   fetchData: getUomList,
 } = usePaginatedList({
-  fetchFn: async ({ page, search }) => {
-    const result = await getUoms({ search, page })
+  fetchFn: async (params: any) => {
+    const result = await getUoms({ search: params.search, page: params['page-number'] || 0 })
     return { success: result.success || false, body: result.body || {} }
   },
   entityName: 'uom',
diff --git a/app/composables/usePaginatedList.ts b/app/composables/usePaginatedList.ts
index d0edafb2..379d2eb6 100644
--- a/app/composables/usePaginatedList.ts
+++ b/app/composables/usePaginatedList.ts
@@ -97,7 +97,6 @@ export function usePaginatedList<T = any>(options: UsePaginatedListOptions<T>) {
         paginationMeta.hasPrev = paginationMeta.page > 1
       }
     } catch (error) {
-      console.error(`Error fetching ${entityName} list:`, error)
       data.value = []
       paginationMeta.recordCount = 0
       paginationMeta.totalPage = 0
@@ -126,6 +125,7 @@ export function usePaginatedList<T = any>(options: UsePaginatedListOptions<T>) {
   watch(
     params,
     (newParams) => {
+      console.log('watch ~ newParams', newParams)
       // Sync search input with URL params (for back/forward navigation)
       if (newParams.search !== searchInput.value) {
         searchInput.value = newParams.search || ''