diff --git a/src/main/java/com/ffii/core/utils/PagingUtils.java b/src/main/java/com/ffii/core/utils/PagingUtils.java
index db47a9c..3dc8359 100644
--- a/src/main/java/com/ffii/core/utils/PagingUtils.java
+++ b/src/main/java/com/ffii/core/utils/PagingUtils.java
@@ -28,11 +28,16 @@ public class PagingUtils {
         int startIndex = (pageNum - 1) * pageSize;
         int endIndex = Math.min(startIndex + pageSize, fullList.size());
 
-        // Ensure we don't go out of bounds
+        // If startIndex is beyond the fullList size, return the remaining records
         if (startIndex < fullList.size()) {
             return fullList.subList(startIndex, endIndex);
         } else {
-            return Collections.emptyList(); // Return empty list if start index is out of bounds
+            // If there are records available, return the remaining records
+            if (!fullList.isEmpty()) {
+                return fullList.subList(fullList.size() - Math.min(pageSize, fullList.size()), fullList.size());
+            } else {
+                return Collections.emptyList(); // Return empty list if fullList is empty
+            }
         }
     }
 }
diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt
index d04f624..83b93cc 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/service/ItemsService.kt
@@ -2,7 +2,6 @@ package com.ffii.fpsms.modules.master.service
 
 import com.ffii.core.support.AbstractBaseEntityService
 import com.ffii.core.support.JdbcDao
-import com.ffii.fpsms.modules.master.dto.ItemFilterRequestDTO
 import com.ffii.fpsms.modules.master.entity.*
 import com.ffii.fpsms.modules.master.web.models.ItemQc
 import com.ffii.fpsms.modules.master.web.models.ItemWithQcResponse
diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt b/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt
index e4b09bd..25e17f3 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/web/ItemsController.kt
@@ -4,7 +4,6 @@ import com.ffii.core.exception.NotFoundException
 import com.ffii.core.response.RecordsRes
 import com.ffii.core.utils.CriteriaArgsBuilder
 import com.ffii.core.utils.PagingUtils
-import com.ffii.fpsms.modules.master.dto.ItemFilterRequestDTO
 import com.ffii.fpsms.modules.master.entity.Items
 import com.ffii.fpsms.modules.master.service.ItemsService
 import com.ffii.fpsms.modules.master.web.models.ItemWithQcResponse