diff --git a/application/Espo/Core/Select/Applier/Factory.php b/application/Espo/Core/Select/Applier/Factory.php
index 1552bac33e..d1be04afbd 100644
--- a/application/Espo/Core/Select/Applier/Factory.php
+++ b/application/Espo/Core/Select/Applier/Factory.php
@@ -61,11 +61,11 @@ class Factory
 
     public const ADDITIONAL = 'additional';
 
-    private $injectableFactory;
+    private InjectableFactory $injectableFactory;
 
-    private $metadata;
+    private Metadata $metadata;
 
-    private $selectManagerFactory;
+    private SelectManagerFactory $selectManagerFactory;
 
     public function __construct(
         InjectableFactory $injectableFactory,
@@ -106,11 +106,8 @@ class Factory
 
         return $this->injectableFactory->createWithBinding($className, $bindingContainer);
     }
-
     protected function getDefaultClassName(string $type): string
     {
-        $className = 'Espo\\Core\\Select\\Applier\Appliers\\' . ucfirst($type);
-
-        return $className;
+        return 'Espo\\Core\\Select\\Applier\Appliers\\' . ucfirst($type);
     }
 }
diff --git a/application/Espo/Core/Select/SelectBuilder.php b/application/Espo/Core/Select/SelectBuilder.php
index aba12d0034..b37217a276 100644
--- a/application/Espo/Core/Select/SelectBuilder.php
+++ b/application/Espo/Core/Select/SelectBuilder.php
@@ -58,38 +58,44 @@ use LogicException;
  */
 class SelectBuilder
 {
-    private $entityType = null;
+    private ?string $entityType = null;
 
-    private $queryBuilder;
+    private ?OrmSelectBuilder $queryBuilder = null;
 
-    private $user = null;
+    private ?Query $sourceQuery = null;
 
-    private $sourceQuery = null;
+    private ?SearchParams $searchParams = null;
+
+    private bool $applyAccessControlFilter = false;
+
+    private bool $applyDefaultOrder = false;
+
+    private ?string $textFilter = null;
+
+    private ?string $primaryFilter = null;
 
     /**
-     * @var SearchParams|null
+     * @var string[]
      */
-    private $searchParams = null;
+    private array $boolFilterList = [];
 
-    private $applyAccessControlFilter = false;
+    /**
+     * @var WhereItem[]
+     */
+    private array $whereItemList = [];
 
-    private $applyDefaultOrder = false;
+    private bool $applyWherePermissionCheck = false;
 
-    private $textFilter = null;
+    private bool $applyComplexExpressionsForbidden = false;
 
-    private $primaryFilter = null;
+    /**
+     * @var class-string[]
+     */
+    private array $additionalApplierClassNameList = [];
 
-    private $boolFilterList = [];
+    private User $user;
 
-    private $whereItemList = [];
-
-    private $applyWherePermissionCheck = false;
-
-    private $applyComplexExpressionsForbidden = false;
-
-    private $additionalApplierClassNameList = [];
-
-    private $applierFactory;
+    private ApplierFactory $applierFactory;
 
     public function __construct(User $user, ApplierFactory $applierFactory)
     {