- Heavy rework on search request handling of entities

src/Repository.php

@@ -681,20 +681,12 @@ class Repository implements RepositoryInterface
     public function filterServerRequest(SearchRequest\SearchRequestInterface $searchRequest, bool $count = true) : self
     {
         if ($count) {
-            $searchRequest->count = $searchRequest->filter($this->serverRequestCountRepository())
-                ->wheres($searchRequest->wheres(), Query\Where::OPERATOR_EQUAL, Query\Where::CONDITION_AND)
-                ->likes($searchRequest->likes(), Query\Where::CONDITION_OR)
-                ->groups($searchRequest->groups())
-                ->count();
+            $searchRequest->applyCount($this->serverRequestCountRepository());
         }
 
-        return $searchRequest->filter($this)
-            ->wheres($searchRequest->wheres(), Query\Where::OPERATOR_EQUAL, Query\Where::CONDITION_AND)
-            ->likes($searchRequest->likes(), Query\Where::CONDITION_OR)
-            ->orders($searchRequest->orders())
-            ->groups($searchRequest->groups())
-            ->offset($searchRequest->offset())
-            ->limit($searchRequest->limit());
+        $searchRequest->apply($this);
+
+        return $this;
     }
 
     protected function serverRequestCountRepository() : Repository