diff --git a/android_bot/.gradle/8.13/executionHistory/executionHistory.bin b/android_bot/.gradle/8.13/executionHistory/executionHistory.bin
index edb57f8b..b849b7bd 100644
Binary files a/android_bot/.gradle/8.13/executionHistory/executionHistory.bin and b/android_bot/.gradle/8.13/executionHistory/executionHistory.bin differ
diff --git a/android_bot/.gradle/8.13/executionHistory/executionHistory.lock b/android_bot/.gradle/8.13/executionHistory/executionHistory.lock
index dc5a5379..2a972215 100644
Binary files a/android_bot/.gradle/8.13/executionHistory/executionHistory.lock and b/android_bot/.gradle/8.13/executionHistory/executionHistory.lock differ
diff --git a/android_bot/.gradle/8.13/fileHashes/fileHashes.bin b/android_bot/.gradle/8.13/fileHashes/fileHashes.bin
index b42a3d3d..514a5f28 100644
Binary files a/android_bot/.gradle/8.13/fileHashes/fileHashes.bin and b/android_bot/.gradle/8.13/fileHashes/fileHashes.bin differ
diff --git a/android_bot/.gradle/8.13/fileHashes/fileHashes.lock b/android_bot/.gradle/8.13/fileHashes/fileHashes.lock
index 7d30270e..59bf925b 100644
Binary files a/android_bot/.gradle/8.13/fileHashes/fileHashes.lock and b/android_bot/.gradle/8.13/fileHashes/fileHashes.lock differ
diff --git a/android_bot/.gradle/8.13/fileHashes/resourceHashesCache.bin b/android_bot/.gradle/8.13/fileHashes/resourceHashesCache.bin
index c2d40fdd..8654902e 100644
Binary files a/android_bot/.gradle/8.13/fileHashes/resourceHashesCache.bin and b/android_bot/.gradle/8.13/fileHashes/resourceHashesCache.bin differ
diff --git a/android_bot/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android_bot/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9a0b5620..c01194a3 100644
Binary files a/android_bot/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android_bot/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/android_bot/app/src/main/java/com/siro/android_bot/service/ScraperAccessibilityService.kt b/android_bot/app/src/main/java/com/siro/android_bot/service/ScraperAccessibilityService.kt
index 40db392a..9cb0c785 100644
--- a/android_bot/app/src/main/java/com/siro/android_bot/service/ScraperAccessibilityService.kt
+++ b/android_bot/app/src/main/java/com/siro/android_bot/service/ScraperAccessibilityService.kt
@@ -76,8 +76,8 @@ class ScraperAccessibilityService : AccessibilityService() {
                         Log.d(TAG, "No tasks available.")
                     }
                 }
-                // Poll every 15 seconds
-                delay(15000)
+                // Poll every 5 seconds
+                delay(5000)
             }
         }
     }
@@ -404,11 +404,9 @@ class ScraperAccessibilityService : AccessibilityService() {
             val nextResult = workerClient.fetchTask()
             if (nextResult != null && nextResult.optBoolean("has_task", false)) {
                 val nextTask = nextResult.getJSONObject("task")
-                currentTask = nextTask
-                taxiFPickupDone = false
-                taxiFDestinationDone = false
-                currentState = BotState.SEARCHING_START
-                Log.i(TAG, "TaxiF: Multi-trip fetched next task ${nextTask.optString("task_id")}, state -> SEARCHING_START")
+                currentState = BotState.IDLE
+                handleTask(nextTask)
+                Log.i(TAG, "Multi-trip: Immediately started next task ${nextTask.optString("task_id")}")
             } else {
                 Log.i(TAG, "No more tasks, returning to IDLE.")
                 currentState = BotState.IDLE