diff --git a/application/Espo/Core/Record/Service.php b/application/Espo/Core/Record/Service.php
index ce12dd7323..953ede558c 100644
--- a/application/Espo/Core/Record/Service.php
+++ b/application/Espo/Core/Record/Service.php
@@ -766,7 +766,7 @@ class Service implements Crud,
             ->withStrictAccessControl()
             ->withSearchParams($preparedSearchParams)
             ->withAdditionalApplierClassNameList(
-                $this->createSelectApplierClassNameList()->get($this->entityType)
+                $this->createSelectApplierClassNameListProvider()->get($this->entityType)
             )
             ->build();
 
@@ -797,8 +797,7 @@ class Service implements Crud,
         return new RecordCollection($collection, $total);
     }
 
-
-    private function createSelectApplierClassNameList(): ApplierClassNameListProvider
+    protected function createSelectApplierClassNameListProvider(): ApplierClassNameListProvider
     {
         return $this->injectableFactory->create(ApplierClassNameListProvider::class);
     }
diff --git a/application/Espo/Services/Email.php b/application/Espo/Services/Email.php
index 6dd6858066..523e0f74a9 100644
--- a/application/Espo/Services/Email.php
+++ b/application/Espo/Services/Email.php
@@ -929,7 +929,7 @@ class Email extends Record implements
             ->from('Email')
             ->withAccessControlFilter();
 
-        $draftsSelectParams = clone $selectBuilder;
+        $draftsSelecBuilder = clone $selectBuilder;
 
         $selectBuilder->withWhere(
             WhereItem::fromRaw([
@@ -952,10 +952,10 @@ class Email extends Record implements
         }
 
         foreach ($folderIdList as $folderId) {
-            $itemSelectBuilder = $selectBuilder;
+            $itemSelectBuilder = clone $selectBuilder;
 
             if ($folderId === 'drafts') {
-                $itemSelectBuilder = $draftsSelectParams;
+                $itemSelectBuilder = clone $draftsSelecBuilder;
             }
 
             $itemSelectBuilder->withWhere(