diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt
index 39d4426..869ac3f 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderQueryService.kt
@@ -116,9 +116,8 @@ class DoPickOrderQueryService(
             .groupBy { it.key.first }
             .mapValues { (_, entries) ->
                 entries.map { it.value }
-                .filter { it.unassigned > 0 } // filter out lanes with no unassigned orders 
+                .filter { it.unassigned > 0 } // filter out lanes with no unassigned orders
                     .sortedByDescending { it.unassigned }
-                    .take(3)
             }
             .filterValues { lanes -> lanes.isNotEmpty() }
             .toSortedMap(compareBy { it })
diff --git a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
index d06a26f..d07fad0 100644
--- a/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoPickOrderService.kt
@@ -445,7 +445,6 @@ open class DoPickOrderService(
                 entries.map { it.value }
                     .filter { it.unassigned > 0 }
                     .sortedByDescending { it.unassigned }
-                    .take(3)
             }
             .filterValues { lanes -> lanes.any { it.unassigned > 0 } }
             .toSortedMap(compareBy { it })
diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
index ede0ae2..e0bf057 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/service/JoPickOrderService.kt
@@ -1871,7 +1871,10 @@ open fun getAllJoPickOrders(isDrink: Boolean?, floor: String?): List<AllJoPickOr
             if (jobOrder.isHidden == true) {
                 return@mapNotNull null
             }
-            
+            if (jobOrder.status == JobOrderStatus.COMPLETED) {
+                return@mapNotNull null
+            }
+
             println("Job order found: ${jobOrder.id}, code: ${jobOrder.code}")
             
             val bom = jobOrder.bom