Reorder query builder to prevent overwriting

Author: jonerickson

src/Drivers/Standard/QueryBuilder.php

@@ -72,6 +72,9 @@ public function buildQuery($query, Request $request)
         $actionMethod = $request->route()->getActionMethod();
 
         if (!$this->intermediateMode) {
+            $this->applyIncludesToQuery($query, $request);
+            $this->applyAggregatesToQuery($query, $request);
+
             if (in_array($actionMethod, ['index', 'search', 'show'])) {
                 if ($actionMethod === 'search') {
                     $this->applyScopesToQuery($query, $request);
@@ -81,9 +84,6 @@ public function buildQuery($query, Request $request)
                 }
                 $this->applySoftDeletesToQuery($query, $request);
             }
-
-            $this->applyIncludesToQuery($query, $request);
-            $this->applyAggregatesToQuery($query, $request);
         }
 
         return $query;