diff --git a/application/Espo/Core/Select/SearchParams.php b/application/Espo/Core/Select/SearchParams.php
index 42f7396d1d..b83982ab22 100644
--- a/application/Espo/Core/Select/SearchParams.php
+++ b/application/Espo/Core/Select/SearchParams.php
@@ -43,7 +43,16 @@ use stdClass;
 class SearchParams
 {
     /** @var array<string, mixed> */
-    private array $rawParams = [];
+    private array $rawParams = [
+        'select' => null,
+        'boolFilterList' => [],
+        'orderBy' => null,
+        'order' => null,
+        'maxSize' => null,
+        'where' => null,
+        'primaryFilter' => null,
+        'textFilter' => null,
+    ];
 
     public const ORDER_ASC = 'ASC';
     public const ORDER_DESC = 'DESC';
diff --git a/application/Espo/Core/Select/SelectBuilder.php b/application/Espo/Core/Select/SelectBuilder.php
index 1a5f05df13..9190259da8 100644
--- a/application/Espo/Core/Select/SelectBuilder.php
+++ b/application/Espo/Core/Select/SelectBuilder.php
@@ -499,11 +499,10 @@ class SelectBuilder
             return;
         }
 
-        $searchParams = SearchParams::fromRaw([
-            'boolFilterList' => $this->boolFilterList,
-            'primaryFilter' => $this->primaryFilter,
-            'textFilter' => $this->textFilter,
-        ]);
+        $searchParams = SearchParams::create()
+            ->withBoolFilterList($this->boolFilterList)
+            ->withPrimaryFilter($this->primaryFilter)
+            ->withTextFilter($this->textFilter);
 
         if ($this->searchParams) {
             $searchParams = SearchParams::merge($searchParams, $this->searchParams);