diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php
index a0a92f434e..6325691a32 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php
@@ -42,6 +42,7 @@ use Espo\{
 class OnlyOwn implements AccessControlFilter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
index a97b1010e8..b47434bb6e 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
@@ -42,6 +42,7 @@ use Espo\{
 class OnlyTeam implements AccessControlFilter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
index 092df6fb7a..5957f3edf6 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
@@ -42,6 +42,7 @@ use Espo\{
 class PortalOnlyAccount implements AccessControlFilter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php
index 065de37c81..f8e39530f4 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php
@@ -42,6 +42,7 @@ use Espo\{
 class PortalOnlyContact implements AccessControlFilter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php b/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php
index 603bd658a0..9f9e06203f 100644
--- a/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php
+++ b/application/Espo/Classes/Select/Email/Appliers/AdditionalApplier.php
@@ -43,6 +43,7 @@ use Espo\{
 class AdditionalApplier extends AdditionalApplierBase
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
index 4509207681..2c70f81ac7 100644
--- a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
+++ b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php
@@ -40,6 +40,7 @@ use Espo\{
 class OnlyMy implements BoolFilter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/Helpers/EmailAddressHelper.php b/application/Espo/Classes/Select/Email/Helpers/EmailAddressHelper.php
index 3b2de39134..b43a1b12b5 100644
--- a/application/Espo/Classes/Select/Email/Helpers/EmailAddressHelper.php
+++ b/application/Espo/Classes/Select/Email/Helpers/EmailAddressHelper.php
@@ -35,6 +35,8 @@ use Espo\{
 
 class EmailAddressHelper
 {
+    private $entityManager;
+
     public function __construct(EntityManager $entityManager)
     {
         $this->entityManager = $entityManager;
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
index f041ad2aca..974cd9a0ec 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php
@@ -45,6 +45,7 @@ use Espo\{
 class EmailAddressEquals implements ItemConverter
 {
     protected $emailAddressHelper;
+
     protected $randomStringGenerator;
 
     public function __construct(
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
index 863ef47d9c..54bb101e4f 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php
@@ -45,7 +45,9 @@ use Espo\{
 class FromEquals implements ItemConverter
 {
     protected $entityManager;
+
     protected $emailAddressHelper;
+
     protected $randomStringGenerator;
 
     public function __construct(
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
index 866298645d..6292410292 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php
@@ -46,7 +46,9 @@ use Espo\{
 class InFolder implements ItemConverter
 {
     protected $user;
+
     protected $entityManager;
+
     protected $joinHelper;
 
     public function __construct(User $user, EntityManager $entityManager, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
index 4cb5792e3e..2834573a1d 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
@@ -45,6 +45,7 @@ use Espo\{
 class IsImportantIsFalse implements ItemConverter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
index 1251965247..ab6c6639f7 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
@@ -45,6 +45,7 @@ use Espo\{
 class IsImportantIsTrue implements ItemConverter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
index dd0a8a028c..75a6aaf28f 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
@@ -45,6 +45,7 @@ use Espo\{
 class IsNotReadIsFalse implements ItemConverter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
index d878c9bbbc..7f96ed2cf8 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
@@ -45,6 +45,7 @@ use Espo\{
 class IsNotReadIsTrue implements ItemConverter
 {
     protected $user;
+
     protected $joinHelper;
 
     public function __construct(User $user, JoinHelper $joinHelper)
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
index f457cd3142..4e0ab33987 100644
--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php
@@ -45,6 +45,7 @@ use Espo\{
 class ToEquals implements ItemConverter
 {
     protected $emailAddressHelper;
+
     protected $randomStringGenerator;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/AccessControl/FilterFactory.php b/application/Espo/Core/Select/AccessControl/FilterFactory.php
index 4a0ddfdf4c..14ce889da5 100644
--- a/application/Espo/Core/Select/AccessControl/FilterFactory.php
+++ b/application/Espo/Core/Select/AccessControl/FilterFactory.php
@@ -43,8 +43,9 @@ use Espo\{
 
 class FilterFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
+    private $injectableFactory;
+
+    private $metadata;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata)
     {
@@ -76,7 +77,7 @@ class FilterFactory
         return (bool) $this->getClassName($entityType, $name);
     }
 
-    protected function getClassName(string $entityType, string $name) : ?string
+    private function getClassName(string $entityType, string $name) : ?string
     {
         if (!$name) {
             throw new Error("Empty access control filter name.");
@@ -104,7 +105,7 @@ class FilterFactory
         return $className;
     }
 
-    protected function getDefaultClassName(string $name) : string
+    private function getDefaultClassName(string $name) : string
     {
         $className = 'Espo\\Core\\Select\\AccessControlFilters\\' . ucfirst($name);
 
diff --git a/application/Espo/Core/Select/AccessControl/FilterResolver.php b/application/Espo/Core/Select/AccessControl/FilterResolver.php
index 07c3c03114..2e91e6f4c9 100644
--- a/application/Espo/Core/Select/AccessControl/FilterResolver.php
+++ b/application/Espo/Core/Select/AccessControl/FilterResolver.php
@@ -34,10 +34,15 @@ use Espo\{
     Entities\User,
 };
 
+/**
+ * @todo Use interface.
+ */
 class FilterResolver
 {
     protected $entityType;
+
     protected $user;
+
     protected $acl;
 
     public function __construct(string $entityType, User $user, Acl $acl)
diff --git a/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php b/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php
index 0075eead47..27ea1588f4 100644
--- a/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php
+++ b/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php
@@ -41,9 +41,11 @@ use Espo\{
 
 class FilterResolverFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
-    protected $aclManager;
+    private $injectableFactory;
+
+    private $metadata;
+
+    private $aclManager;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata, AclManager $aclManager)
     {
@@ -65,7 +67,7 @@ class FilterResolverFactory
         ]);
     }
 
-    protected function getClassName(string $entityType) : string
+    private function getClassName(string $entityType) : string
     {
         return $this->metadata->get([
             'selectDefs', $entityType, 'accessControlFilterResolverClassName'
diff --git a/application/Espo/Core/Select/AccessControlFilters/OnlyOwn.php b/application/Espo/Core/Select/AccessControlFilters/OnlyOwn.php
index 09dd442b9d..1b2265445a 100644
--- a/application/Espo/Core/Select/AccessControlFilters/OnlyOwn.php
+++ b/application/Espo/Core/Select/AccessControlFilters/OnlyOwn.php
@@ -39,7 +39,9 @@ use Espo\{
 class OnlyOwn implements AccessControlFilter
 {
     protected $entityType;
+
     protected $user;
+
     protected $fieldHelper;
 
     public function __construct(string $entityType, User $user, FieldHelper $fieldHelper)
diff --git a/application/Espo/Core/Select/AccessControlFilters/OnlyTeam.php b/application/Espo/Core/Select/AccessControlFilters/OnlyTeam.php
index fc3b71f03d..463a534cae 100644
--- a/application/Espo/Core/Select/AccessControlFilters/OnlyTeam.php
+++ b/application/Espo/Core/Select/AccessControlFilters/OnlyTeam.php
@@ -39,7 +39,9 @@ use Espo\{
 class OnlyTeam implements AccessControlFilter
 {
     protected $entityType;
+
     protected $user;
+
     protected $fieldHelper;
 
     public function __construct(string $entityType, User $user, FieldHelper $fieldHelper)
diff --git a/application/Espo/Core/Select/AccessControlFilters/PortalOnlyAccount.php b/application/Espo/Core/Select/AccessControlFilters/PortalOnlyAccount.php
index 941acdd96a..914a7a93a5 100644
--- a/application/Espo/Core/Select/AccessControlFilters/PortalOnlyAccount.php
+++ b/application/Espo/Core/Select/AccessControlFilters/PortalOnlyAccount.php
@@ -39,7 +39,9 @@ use Espo\{
 class PortalOnlyAccount implements AccessControlFilter
 {
     protected $entityType;
+
     protected $user;
+
     protected $fieldHelper;
 
     public function __construct(string $entityType, User $user, FieldHelper $fieldHelper)
diff --git a/application/Espo/Core/Select/AccessControlFilters/PortalOnlyContact.php b/application/Espo/Core/Select/AccessControlFilters/PortalOnlyContact.php
index 4d340f1e64..2e6fe4156d 100644
--- a/application/Espo/Core/Select/AccessControlFilters/PortalOnlyContact.php
+++ b/application/Espo/Core/Select/AccessControlFilters/PortalOnlyContact.php
@@ -39,7 +39,9 @@ use Espo\{
 class PortalOnlyContact implements AccessControlFilter
 {
     protected $entityType;
+
     protected $user;
+
     protected $fieldHelper;
 
     public function __construct(string $entityType, User $user, FieldHelper $fieldHelper)
diff --git a/application/Espo/Core/Select/AccessControlFilters/PortalOnlyOwn.php b/application/Espo/Core/Select/AccessControlFilters/PortalOnlyOwn.php
index c2a919dcb3..5dd766906d 100644
--- a/application/Espo/Core/Select/AccessControlFilters/PortalOnlyOwn.php
+++ b/application/Espo/Core/Select/AccessControlFilters/PortalOnlyOwn.php
@@ -39,7 +39,9 @@ use Espo\{
 class PortalOnlyOwn implements AccessControlFilter
 {
     protected $entityType;
+
     protected $user;
+
     protected $fieldHelper;
 
     public function __construct(string $entityType, User $user, FieldHelper $fieldHelper)
diff --git a/application/Espo/Core/Select/Appliers/AccessControlFilterApplier.php b/application/Espo/Core/Select/Appliers/AccessControlFilterApplier.php
index c2431a4676..18e5c2cf73 100644
--- a/application/Espo/Core/Select/Appliers/AccessControlFilterApplier.php
+++ b/application/Espo/Core/Select/Appliers/AccessControlFilterApplier.php
@@ -47,10 +47,15 @@ class AccessControlFilterApplier
     protected $acl;
 
     protected $entityType;
+
     protected $user;
+
     protected $accessControlFilterFactory;
+
     protected $accessControlFilterResolverFactory;
+
     protected $aclManager;
+
     protected $selectManager;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Appliers/BoolFilterListApplier.php b/application/Espo/Core/Select/Appliers/BoolFilterListApplier.php
index 6d1f771ed6..a699a40125 100644
--- a/application/Espo/Core/Select/Appliers/BoolFilterListApplier.php
+++ b/application/Espo/Core/Select/Appliers/BoolFilterListApplier.php
@@ -45,8 +45,11 @@ use Espo\{
 class BoolFilterListApplier
 {
     protected $entityType;
+
     protected $user;
+
     protected $selectManager;
+
     protected $boolFilterFactory;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Appliers/OrderApplier.php b/application/Espo/Core/Select/Appliers/OrderApplier.php
index a994613baa..b3c64d9753 100644
--- a/application/Espo/Core/Select/Appliers/OrderApplier.php
+++ b/application/Espo/Core/Select/Appliers/OrderApplier.php
@@ -49,7 +49,9 @@ class OrderApplier
     protected $entityType;
 
     protected $user;
+
     protected $metadataProvider;
+
     protected $itemConverterFactory;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Appliers/PrimaryFilterApplier.php b/application/Espo/Core/Select/Appliers/PrimaryFilterApplier.php
index c6bf0707bb..0d88a734fb 100644
--- a/application/Espo/Core/Select/Appliers/PrimaryFilterApplier.php
+++ b/application/Espo/Core/Select/Appliers/PrimaryFilterApplier.php
@@ -43,8 +43,11 @@ use Espo\{
 class PrimaryFilterApplier
 {
     protected $entityType;
+
     protected $user;
+
     protected $selectManager;
+
     protected $primaryFilterFactory;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Appliers/SelectApplier.php b/application/Espo/Core/Select/Appliers/SelectApplier.php
index d99368f8a2..c5c96c5e39 100644
--- a/application/Espo/Core/Select/Appliers/SelectApplier.php
+++ b/application/Espo/Core/Select/Appliers/SelectApplier.php
@@ -60,7 +60,9 @@ class SelectApplier
     protected $entityType;
 
     protected $user;
+
     protected $fieldUtil;
+
     protected $metadataProvider;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Appliers/TextFilterApplier.php b/application/Espo/Core/Select/Appliers/TextFilterApplier.php
index c0232d7bb5..bd5e6040e8 100644
--- a/application/Espo/Core/Select/Appliers/TextFilterApplier.php
+++ b/application/Espo/Core/Select/Appliers/TextFilterApplier.php
@@ -66,8 +66,11 @@ class TextFilterApplier
     protected $entityType;
 
     protected $user;
+
     protected $config;
+
     protected $metadataProvider;
+
     protected $fullTextSearchDataComposerFactory;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Appliers/WhereApplier.php b/application/Espo/Core/Select/Appliers/WhereApplier.php
index 4838e6a169..43183612dc 100644
--- a/application/Espo/Core/Select/Appliers/WhereApplier.php
+++ b/application/Espo/Core/Select/Appliers/WhereApplier.php
@@ -44,8 +44,11 @@ use Espo\{
 class WhereApplier
 {
     protected $entityType;
+
     protected $user;
+
     protected $converterFactory;
+
     protected $checkerFactory;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/BoolFilters/Followed.php b/application/Espo/Core/Select/BoolFilters/Followed.php
index f2e2221dea..6c6bbbf25a 100644
--- a/application/Espo/Core/Select/BoolFilters/Followed.php
+++ b/application/Espo/Core/Select/BoolFilters/Followed.php
@@ -39,6 +39,7 @@ use Espo\{
 class Followed implements BoolFilter
 {
     protected $entityType;
+
     protected $user;
 
     public function __construct(string $entityType, User $user)
diff --git a/application/Espo/Core/Select/Factory/ApplierFactory.php b/application/Espo/Core/Select/Factory/ApplierFactory.php
index ee164e2095..b5181c0abe 100644
--- a/application/Espo/Core/Select/Factory/ApplierFactory.php
+++ b/application/Espo/Core/Select/Factory/ApplierFactory.php
@@ -51,9 +51,11 @@ class ApplierFactory
     const BOOL_FILTER_LIST = 'boolFilterList';
     const ADDITIONAL = 'additional';
 
-    protected $injectableFactory;
-    protected $metadata;
-    protected $selectManagerFactory;
+    private $injectableFactory;
+
+    private $metadata;
+
+    private $selectManagerFactory;
 
     public function __construct(
         InjectableFactory $injectableFactory, Metadata $metadata, SelectManagerFactory $selectManagerFactory
diff --git a/application/Espo/Core/Select/Factory/BoolFilterFactory.php b/application/Espo/Core/Select/Factory/BoolFilterFactory.php
index fbe92687c5..f83e3c9cde 100644
--- a/application/Espo/Core/Select/Factory/BoolFilterFactory.php
+++ b/application/Espo/Core/Select/Factory/BoolFilterFactory.php
@@ -42,8 +42,9 @@ use Espo\{
 
 class BoolFilterFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
+    private $injectableFactory;
+
+    private $metadata;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata)
     {
diff --git a/application/Espo/Core/Select/Factory/PrimaryFilterFactory.php b/application/Espo/Core/Select/Factory/PrimaryFilterFactory.php
index 6242e9ba10..0becd0dfad 100644
--- a/application/Espo/Core/Select/Factory/PrimaryFilterFactory.php
+++ b/application/Espo/Core/Select/Factory/PrimaryFilterFactory.php
@@ -42,8 +42,9 @@ use Espo\{
 
 class PrimaryFilterFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
+    private $injectableFactory;
+
+    private $metadata;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata)
     {
diff --git a/application/Espo/Core/Select/Helpers/FieldHelper.php b/application/Espo/Core/Select/Helpers/FieldHelper.php
index 3e856bed7a..ff9187d3cc 100644
--- a/application/Espo/Core/Select/Helpers/FieldHelper.php
+++ b/application/Espo/Core/Select/Helpers/FieldHelper.php
@@ -41,9 +41,9 @@ class FieldHelper
 {
     private $seed = null;
 
-    protected $entityType;
+    private $entityType;
 
-    protected $entityManager;
+    private $entityManager;
 
     public function __construct(string $entityType, EntityManager $entityManager)
     {
@@ -51,7 +51,7 @@ class FieldHelper
         $this->entityManager = $entityManager;
     }
 
-    protected function getSeed() : Entity
+    private function getSeed() : Entity
     {
         return $this->seed ?? $this->entityManager->getEntity($this->entityType);
     }
diff --git a/application/Espo/Core/Select/Order/ItemConverterFactory.php b/application/Espo/Core/Select/Order/ItemConverterFactory.php
index cce878fb88..7967ee7753 100644
--- a/application/Espo/Core/Select/Order/ItemConverterFactory.php
+++ b/application/Espo/Core/Select/Order/ItemConverterFactory.php
@@ -37,8 +37,9 @@ use Espo\Core\{
 
 class ItemConverterFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
+    private $injectableFactory;
+
+    private $metadata;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata)
     {
@@ -64,7 +65,7 @@ class ItemConverterFactory
         ]);
     }
 
-    protected function getClassName(string $entityType, string $field) : ?string
+    private function getClassName(string $entityType, string $field) : ?string
     {
         $className = $this->metadata->get([
             'selectDefs', $entityType, 'orderItemConverterClassNameMap', $field
diff --git a/application/Espo/Core/Select/Order/ItemConverters/EnumType.php b/application/Espo/Core/Select/Order/ItemConverters/EnumType.php
index 2b06227517..ff1b80c7f3 100644
--- a/application/Espo/Core/Select/Order/ItemConverters/EnumType.php
+++ b/application/Espo/Core/Select/Order/ItemConverters/EnumType.php
@@ -38,9 +38,9 @@ use Espo\Core\{
 
 class EnumType implements ItemConverter
 {
-    protected $entityType;
+    private $entityType;
 
-    protected $metadata;
+    private $metadata;
 
     public function __construct(
         string $entityType,
diff --git a/application/Espo/Core/Select/Order/MetadataProvider.php b/application/Espo/Core/Select/Order/MetadataProvider.php
index f25e0e9b00..e3228a7a7d 100644
--- a/application/Espo/Core/Select/Order/MetadataProvider.php
+++ b/application/Espo/Core/Select/Order/MetadataProvider.php
@@ -39,8 +39,9 @@ use Espo\{
 
 class MetadataProvider
 {
-    protected $metadata;
-    protected $entityManager;
+    private $metadata;
+
+    private $entityManager;
 
     public function __construct(Metadata $metadata, EntityManager $entityManager)
     {
diff --git a/application/Espo/Core/Select/PrimaryFilters/Followed.php b/application/Espo/Core/Select/PrimaryFilters/Followed.php
index 26446f0fbf..74fceb9340 100644
--- a/application/Espo/Core/Select/PrimaryFilters/Followed.php
+++ b/application/Espo/Core/Select/PrimaryFilters/Followed.php
@@ -37,8 +37,9 @@ use Espo\{
 
 class Followed implements PrimaryFilter
 {
-    protected $entityType;
-    protected $user;
+    private $entityType;
+
+    private $user;
 
     public function __construct(string $entityType, User $user)
     {
diff --git a/application/Espo/Core/Select/SearchParams.php b/application/Espo/Core/Select/SearchParams.php
index ad230ecba6..bdae5238fa 100644
--- a/application/Espo/Core/Select/SearchParams.php
+++ b/application/Espo/Core/Select/SearchParams.php
@@ -36,7 +36,7 @@ use InvalidArgumentException;
  */
 class SearchParams
 {
-    protected $rawParams;
+    private $rawParams;
 
     const ORDER_ASC = 'ASC';
     const ORDER_DESC = 'DESC';
@@ -268,7 +268,7 @@ class SearchParams
     /**
      * For compatibility with the legacy definition.
      */
-    protected function adjustParams(array &$params) : void
+    private function adjustParams(array &$params) : void
     {
         if (!$params['where']) {
             return;
diff --git a/application/Espo/Core/Select/Select/MetadataProvider.php b/application/Espo/Core/Select/Select/MetadataProvider.php
index 93fc90fea6..5df48dfa68 100644
--- a/application/Espo/Core/Select/Select/MetadataProvider.php
+++ b/application/Espo/Core/Select/Select/MetadataProvider.php
@@ -39,8 +39,9 @@ use Espo\{
 
 class MetadataProvider
 {
-    protected $metadata;
-    protected $entityManager;
+    private $metadata;
+
+    private $entityManager;
 
     public function __construct(Metadata $metadata, EntityManager $entityManager)
     {
diff --git a/application/Espo/Core/Select/SelectBuilder.php b/application/Espo/Core/Select/SelectBuilder.php
index 6de6ebfdd7..1ec515b67b 100644
--- a/application/Espo/Core/Select/SelectBuilder.php
+++ b/application/Espo/Core/Select/SelectBuilder.php
@@ -60,33 +60,33 @@ use LogicException;
  */
 class SelectBuilder
 {
-    protected $entityType = null;
+    private $entityType = null;
 
-    protected $queryBuilder;
+    private $queryBuilder;
 
-    protected $user = null;
+    private $user = null;
 
-    protected $sourceQuery = null;
+    private $sourceQuery = null;
 
-    protected $searchParams = null;
+    private $searchParams = null;
 
-    protected $applyAccessControlFilter = false;
+    private $applyAccessControlFilter = false;
 
-    protected $applyDefaultOrder = false;
+    private $applyDefaultOrder = false;
 
-    protected $textFilter = null;
+    private $textFilter = null;
 
-    protected $primaryFilter = null;
+    private $primaryFilter = null;
 
-    protected $boolFilterList = [];
+    private $boolFilterList = [];
 
-    protected $whereItemList = [];
+    private $whereItemList = [];
 
-    protected $applyWherePermissionCheck = false;
+    private $applyWherePermissionCheck = false;
 
-    protected $applyComplexExpressionsForbidden = false;
+    private $applyComplexExpressionsForbidden = false;
 
-    protected $applierFactory;
+    private $applierFactory;
 
     public function __construct(User $user, ApplierFactory $applierFactory)
     {
@@ -322,7 +322,7 @@ class SelectBuilder
         return $this;
     }
 
-    protected function applyPrimaryFilter() : void
+    private function applyPrimaryFilter() : void
     {
         $this->createPrimaryFilterApplier()
             ->apply(
@@ -331,7 +331,7 @@ class SelectBuilder
             );
     }
 
-    protected function applyBoolFilterList() : void
+    private function applyBoolFilterList() : void
     {
         $this->createBoolFilterListApplier()
             ->apply(
@@ -340,7 +340,7 @@ class SelectBuilder
             );
     }
 
-    protected function applyTextFilter() : void
+    private function applyTextFilter() : void
     {
         $noFullTextSearch = false;
 
@@ -358,7 +358,7 @@ class SelectBuilder
             );
     }
 
-    protected function applyAccessControlFilter() : void
+    private function applyAccessControlFilter() : void
     {
         $this->createAccessControlFilterApplier()
             ->apply(
@@ -366,7 +366,7 @@ class SelectBuilder
             );
     }
 
-    protected function applyDefaultOrder() : void
+    private function applyDefaultOrder() : void
     {
         $order = null;
 
@@ -386,14 +386,14 @@ class SelectBuilder
             );
     }
 
-    protected function applyWhereItemList() : void
+    private function applyWhereItemList() : void
     {
         foreach ($this->whereItemList as $whereItem) {
             $this->applyWhereItem($whereItem);
         }
     }
 
-    protected function applyWhereItem(WhereItem $whereItem) : void
+    private function applyWhereItem(WhereItem $whereItem) : void
     {
         $params = WhereParams::fromArray([
             'applyPermissionCheck' => $this->applyWherePermissionCheck,
@@ -408,7 +408,7 @@ class SelectBuilder
             );
     }
 
-    protected function applyFromSearchParams() : void
+    private function applyFromSearchParams() : void
     {
         if (!$this->searchParams) {
             return;
@@ -462,7 +462,7 @@ class SelectBuilder
         }
     }
 
-    protected function applyAdditional() : void
+    private function applyAdditional() : void
     {
         $searchParams = SearchParams::fromRaw([
             'boolFilterList' => $this->boolFilterList,
@@ -480,47 +480,47 @@ class SelectBuilder
         );
     }
 
-    protected function createWhereApplier() : WhereApplier
+    private function createWhereApplier() : WhereApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::WHERE);
     }
 
-    protected function createSelectApplier() : SelectApplier
+    private function createSelectApplier() : SelectApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::SELECT);
     }
 
-    protected function createOrderApplier() : OrderApplier
+    private function createOrderApplier() : OrderApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::ORDER);
     }
 
-    protected function createLimitApplier() : LimitApplier
+    private function createLimitApplier() : LimitApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::LIMIT);
     }
 
-    protected function createAccessControlFilterApplier() : AccessControlFilterApplier
+    private function createAccessControlFilterApplier() : AccessControlFilterApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::ACCESS_CONTROL_FILTER);
     }
 
-    protected function createTextFilterApplier() : TextFilterApplier
+    private function createTextFilterApplier() : TextFilterApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::TEXT_FILTER);
     }
 
-    protected function createPrimaryFilterApplier() : PrimaryFilterApplier
+    private function createPrimaryFilterApplier() : PrimaryFilterApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::PRIMARY_FILTER);
     }
 
-    protected function createBoolFilterListApplier() : BoolFilterListApplier
+    private function createBoolFilterListApplier() : BoolFilterListApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::BOOL_FILTER_LIST);
     }
 
-    protected function createAdditionalApplier() : AdditionalApplier
+    private function createAdditionalApplier() : AdditionalApplier
     {
         return $this->applierFactory->create($this->entityType, $this->user, ApplierFactory::ADDITIONAL);
     }
diff --git a/application/Espo/Core/Select/SelectBuilderFactory.php b/application/Espo/Core/Select/SelectBuilderFactory.php
index 928b812175..a4562a0660 100644
--- a/application/Espo/Core/Select/SelectBuilderFactory.php
+++ b/application/Espo/Core/Select/SelectBuilderFactory.php
@@ -38,7 +38,7 @@ use Espo\Core\{
  */
 class SelectBuilderFactory
 {
-    protected $injectableFactory;
+    private $injectableFactory;
 
     public function __construct(InjectableFactory $injectableFactory)
     {
diff --git a/application/Espo/Core/Select/Text/FullTextSearchDataComposer.php b/application/Espo/Core/Select/Text/FullTextSearchDataComposer.php
index 2109cc0645..e1f57e5112 100644
--- a/application/Espo/Core/Select/Text/FullTextSearchDataComposer.php
+++ b/application/Espo/Core/Select/Text/FullTextSearchDataComposer.php
@@ -40,6 +40,7 @@ class FullTextSearchDataComposer
     protected $entityType;
 
     protected $config;
+
     protected $metadataProvider;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Text/FullTextSearchDataComposerFactory.php b/application/Espo/Core/Select/Text/FullTextSearchDataComposerFactory.php
index 0adcea15f7..8f5a1f018a 100644
--- a/application/Espo/Core/Select/Text/FullTextSearchDataComposerFactory.php
+++ b/application/Espo/Core/Select/Text/FullTextSearchDataComposerFactory.php
@@ -36,8 +36,9 @@ use Espo\Core\{
 
 class FullTextSearchDataComposerFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
+    private $injectableFactory;
+
+    private $metadata;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata)
     {
@@ -54,7 +55,7 @@ class FullTextSearchDataComposerFactory
         ]);
     }
 
-    protected function getClassName(string $entityType) : string
+    private function getClassName(string $entityType) : string
     {
         return
             $this->metadata->get([
diff --git a/application/Espo/Core/Select/Text/MetadataProvider.php b/application/Espo/Core/Select/Text/MetadataProvider.php
index 692061f1bb..c839c9dbf5 100644
--- a/application/Espo/Core/Select/Text/MetadataProvider.php
+++ b/application/Espo/Core/Select/Text/MetadataProvider.php
@@ -37,8 +37,9 @@ use Espo\ORM\Defs\Defs;
 
 class MetadataProvider
 {
-    protected $metadata;
-    protected $ormDefs;
+    private $metadata;
+
+    private $ormDefs;
 
     public function __construct(Metadata $metadata, Defs $ormDefs)
     {
diff --git a/application/Espo/Core/Select/Where/Checker.php b/application/Espo/Core/Select/Where/Checker.php
index e6134e1499..3865b50dd5 100644
--- a/application/Espo/Core/Select/Where/Checker.php
+++ b/application/Espo/Core/Select/Where/Checker.php
@@ -45,12 +45,13 @@ class Checker
 {
     private $seed = null;
 
-    protected $entityType;
+    private $entityType;
 
-    protected $entityManager;
-    protected $acl;
+    private $entityManager;
 
-    protected $nestingTypeList = [
+    private $acl;
+
+    private $nestingTypeList = [
         'or',
         'and',
         'subQueryIn',
@@ -58,13 +59,13 @@ class Checker
         'not',
     ];
 
-    protected $subQueryTypeList = [
+    private $subQueryTypeList = [
         'subQueryIn',
         'subQueryNotIn',
         'not',
     ];
 
-    protected $linkTypeList = [
+    private $linkTypeList = [
         'inCategory',
         'isLinked',
         'isNotLinked',
@@ -86,7 +87,7 @@ class Checker
         $this->checkItem($item, $params);
     }
 
-    protected function checkItem(Item $item, Params $params) : void
+    private function checkItem(Item $item, Params $params) : void
     {
         $type = $item->getType();
         $attribute = $item->getAttribute();
@@ -129,7 +130,7 @@ class Checker
         }
     }
 
-    protected function checkAttributeExistence(string $attribute, string $type) : void
+    private function checkAttributeExistence(string $attribute, string $type) : void
     {
         if (strpos($attribute, '.') !== false) {
             // @todo Check existance of foreign attributes.
@@ -149,7 +150,7 @@ class Checker
         }
     }
 
-    protected function checkAttributePermission(string $attribute, string $type) : void
+    private function checkAttributePermission(string $attribute, string $type) : void
     {
         $entityType = $this->entityType;
 
@@ -210,7 +211,7 @@ class Checker
         }
     }
 
-    protected function getSeed() : Entity
+    private function getSeed() : Entity
     {
         return $this->seed ?? $this->entityManager->getEntity($this->entityType);
     }
diff --git a/application/Espo/Core/Select/Where/CheckerFactory.php b/application/Espo/Core/Select/Where/CheckerFactory.php
index df4478b3f6..fbb3dc7c30 100644
--- a/application/Espo/Core/Select/Where/CheckerFactory.php
+++ b/application/Espo/Core/Select/Where/CheckerFactory.php
@@ -37,8 +37,9 @@ use Espo\{
 
 class CheckerFactory
 {
-    protected $injectableFactory;
-    protected $aclManager;
+    private $injectableFactory;
+
+    private $aclManager;
 
     public function __construct(InjectableFactory $injectableFactory, AclManager $aclManager)
     {
diff --git a/application/Espo/Core/Select/Where/Converter.php b/application/Espo/Core/Select/Where/Converter.php
index d055b23414..44e767b72e 100644
--- a/application/Espo/Core/Select/Where/Converter.php
+++ b/application/Espo/Core/Select/Where/Converter.php
@@ -45,10 +45,15 @@ use Espo\{
 class Converter
 {
     protected $entityType;
+
     protected $user;
+
     protected $itemConverter;
+
     protected $scanner;
+
     protected $randomStringGenerator;
+
     protected $ormDefs;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Where/ConverterFactory.php b/application/Espo/Core/Select/Where/ConverterFactory.php
index de189fa12d..08fe90de1a 100644
--- a/application/Espo/Core/Select/Where/ConverterFactory.php
+++ b/application/Espo/Core/Select/Where/ConverterFactory.php
@@ -40,8 +40,9 @@ use Espo\{
 
 class ConverterFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
+    private $injectableFactory;
+
+    private $metadata;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata)
     {
@@ -75,7 +76,7 @@ class ConverterFactory
         ]);
     }
 
-    protected function getConverterClassName(string $entityType) : string
+    private function getConverterClassName(string $entityType) : string
     {
         $className = $this->metadata->get(['selectDefs', $entityType, 'whereConverterClassName']);
 
@@ -86,7 +87,7 @@ class ConverterFactory
         return Converter::class;
     }
 
-    protected function getItemConverterClassName(string $entityType) : string
+    private function getItemConverterClassName(string $entityType) : string
     {
         $className = $this->metadata->get(['selectDefs', $entityType, 'whereItemConverterClassName']);
 
@@ -97,7 +98,7 @@ class ConverterFactory
         return ItemGeneralConverter::class;
     }
 
-    protected function getDateTimeItemTransformerClassName(string $entityType) : string
+    private function getDateTimeItemTransformerClassName(string $entityType) : string
     {
         $className = $this->metadata->get(['selectDefs', $entityType, 'whereDateTimeItemTransformerClassName']);
 
diff --git a/application/Espo/Core/Select/Where/DateTimeItemTransformer.php b/application/Espo/Core/Select/Where/DateTimeItemTransformer.php
index 4ac530b47e..2718d5d225 100644
--- a/application/Espo/Core/Select/Where/DateTimeItemTransformer.php
+++ b/application/Espo/Core/Select/Where/DateTimeItemTransformer.php
@@ -44,6 +44,7 @@ use DateInterval;
 class DateTimeItemTransformer
 {
     protected $entityType;
+
     protected $user;
 
     public function __construct(string $entityType, User $user)
diff --git a/application/Espo/Core/Select/Where/ItemConverterFactory.php b/application/Espo/Core/Select/Where/ItemConverterFactory.php
index 307d985bef..f55e677299 100644
--- a/application/Espo/Core/Select/Where/ItemConverterFactory.php
+++ b/application/Espo/Core/Select/Where/ItemConverterFactory.php
@@ -41,8 +41,9 @@ use Espo\{
 
 class ItemConverterFactory
 {
-    protected $injectableFactory;
-    protected $metadata;
+    private $injectableFactory;
+
+    private $metadata;
 
     public function __construct(InjectableFactory $injectableFactory, Metadata $metadata)
     {
diff --git a/application/Espo/Core/Select/Where/ItemGeneralConverter.php b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
index 6593b7934d..682a9c4553 100644
--- a/application/Espo/Core/Select/Where/ItemGeneralConverter.php
+++ b/application/Espo/Core/Select/Where/ItemGeneralConverter.php
@@ -51,13 +51,21 @@ use DateInterval;
 class ItemGeneralConverter
 {
     protected $entityType;
+
     protected $user;
+
     protected $dateTimeItemTransformer;
+
     protected $scanner;
+
     protected $itemConverterFactory;
+
     protected $randomStringGenerator;
+
     protected $entityManager;
+
     protected $ormDefs;
+
     protected $config;
 
     public function __construct(
diff --git a/application/Espo/Core/Select/Where/Scanner.php b/application/Espo/Core/Select/Where/Scanner.php
index 9d10794051..1d5f427dbb 100644
--- a/application/Espo/Core/Select/Where/Scanner.php
+++ b/application/Espo/Core/Select/Where/Scanner.php
@@ -39,16 +39,16 @@ use Espo\{
 
 class Scanner
 {
-    protected $entityManager;
+    private $entityManager;
 
     private $seedHash = [];
 
-    protected $nestingTypeList = [
+    private $nestingTypeList = [
         'or',
         'and',
     ];
 
-    protected $subQueryTypeList = [
+    private $subQueryTypeList = [
         'subQueryIn',
         'subQueryNotIn',
         'not',
@@ -70,7 +70,7 @@ class Scanner
         $this->applyLeftJoinsFromItem($queryBuilder, $item, $entityType);
     }
 
-    protected function applyLeftJoinsFromItem(QueryBuilder $queryBuilder, Item $item, string $entityType) : void
+    private function applyLeftJoinsFromItem(QueryBuilder $queryBuilder, Item $item, string $entityType) : void
     {
         $type = $item->getType();
         $value = $item->getValue();
@@ -99,7 +99,7 @@ class Scanner
         $this->applyLeftJoinsFromAttribute($queryBuilder, $attribute, $entityType);
     }
 
-    protected function applyLeftJoinsFromAttribute(
+    private function applyLeftJoinsFromAttribute(
         QueryBuilder $queryBuilder, string $attribute, string $entityType
     ) : void {
 
@@ -142,7 +142,7 @@ class Scanner
         }
     }
 
-    protected function getSeed(string $entityType) : Entity
+    private function getSeed(string $entityType) : Entity
     {
         if (!isset($this->seedHash[$entityType])) {
             $this->seedHash[$entityType] = $this->entityManager->getEntity($entityType);