diff --git a/app/Http/Controllers/TrackerController.php b/app/Http/Controllers/TrackerController.php
index 57bd9da..6f9d223 100644
--- a/app/Http/Controllers/TrackerController.php
+++ b/app/Http/Controllers/TrackerController.php
@@ -47,18 +47,20 @@ class TrackerController extends Controller
         if ($fromCheckin) {
             $tripData->checkins = array_filter(
                 $tripData->checkins,
-                function ($checkin) use ($fromCheckin) {
-                    return $checkin->id >= $fromCheckin;
-                }
+                function ($key) use ($fromCheckin) {
+                    return $key >= $fromCheckin;
+                },
+                ARRAY_FILTER_USE_KEY
             );
         }
 
         if ($toCheckin) {
             $tripData->checkins = array_filter(
                 $tripData->checkins,
-                function ($checkin) use ($toCheckin) {
-                    return $checkin->id <= $toCheckin;
-                }
+                function ($key) use ($toCheckin) {
+                    return $key <= $toCheckin;
+                },
+                ARRAY_FILTER_USE_KEY
             );
         }
 
diff --git a/phpcs.xml b/phpcs.xml
index 8a52039..84b5f53 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -13,7 +13,6 @@
     <file>routes</file>
     <file>tests</file>
 
-    <exclude-pattern>config/broadcasting.php</exclude-pattern>
     <exclude-pattern>bootstrap/cache/*</exclude-pattern>
     <exclude-pattern>bootstrap/autoload.php</exclude-pattern>
     <exclude-pattern>*/migrations/*</exclude-pattern>