diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php
index 649e727c..54cb6a99 100644
--- a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php
+++ b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php
@@ -63,7 +63,7 @@ class FetchAdminWFPendingApprovalPOLogic extends AbstractControllerLogic
                 $query->where('key', 'approve_po_admin_workflow_processed')
                     ->orWhere(function ($query) {
                         $query->where('key', 'approve_po_admin_workflow_processing')
-                                ->where('updated_at', '>', Carbon::now()->subHour());
+                                ->where('updated_at', '>', Carbon::now()->subMinutes(30));
                     });
             })
             ->pluck('owner_id')
diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php
index 8731c659..89019ae2 100644
--- a/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php
+++ b/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php
@@ -129,14 +129,14 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic
                 $key1 = '1688_'.$key1;
                 $key2 = '1688_'.$key2;
             }
-            if (strpos($currentQuestion['question_number'], 'fill_po') === 0) {
-                $key1 = 'fill_po_'.$key1;
-                $key2 = 'fill_po_'.$key2;
-            }
-            if (strpos($currentQuestion['question_number'], 'approve_po') === 0) {
-                $key1 = 'approve_po_'.$key1;
-                $key2 = 'approve_po_'.$key2;
-            }
+            // if (strpos($currentQuestion['question_number'], 'fill_po') === 0) {
+            //     $key1 = 'fill_po_'.$key1;
+            //     $key2 = 'fill_po_'.$key2;
+            // }
+            // if (strpos($currentQuestion['question_number'], 'approve_po') === 0) {
+            //     $key1 = 'approve_po_'.$key1;
+            //     $key2 = 'approve_po_'.$key2;
+            // }
 
             $processingRecord = $booking->attributesKVP()->where('key', $key2)->first();
             if ($processingRecord) {
diff --git a/resources/assets/vue/vuex/modules/loadRequestQueue.js b/resources/assets/vue/vuex/modules/loadRequestQueue.js
index 2bd794aa..76faf8d1 100644
--- a/resources/assets/vue/vuex/modules/loadRequestQueue.js
+++ b/resources/assets/vue/vuex/modules/loadRequestQueue.js
@@ -14,9 +14,6 @@ export default {
         getListDetails: (state) => (name) => {
             return state.queue.find(list => list.name === name);
         },
-        // getListData: (state, getters) => (name) => {
-        //     return (!getters.isInCompleteQueue()) ? state.queue.find(list => list.name === name).data : [];
-        // },
         getListData: (state, getters) => (name) => {
             if (!getters.isInCompleteQueue(name)) {
                 const list = state.queue.find(list => list.name === name);