diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index 33024b82f8..841bf017e7 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -1233,7 +1233,7 @@ abstract class BaseQueryComposer implements QueryComposer
     }
 
     protected function getFunctionArgumentPart(
-        BaseEntity $entity,
+        Entity $entity,
         string $attribute,
         bool $distinct, array &$params
     ): string {
@@ -1997,7 +1997,7 @@ abstract class BaseQueryComposer implements QueryComposer
     }
 
     protected function getOrderExpressionPart(
-        BaseEntity $entity,
+        Entity $entity,
         $orderBy = null,
         $order = null,
         ?array &$params = null,
@@ -2021,7 +2021,11 @@ abstract class BaseQueryComposer implements QueryComposer
                     }
 
                     $arr[] = $this->getOrderExpressionPart(
-                        $entity, $orderByInternal, $orderInternal, $params, $noCustom
+                        $entity,
+                        $orderByInternal,
+                        $orderInternal,
+                        $params,
+                        $noCustom
                     );
                 }
             }
@@ -2034,7 +2038,6 @@ abstract class BaseQueryComposer implements QueryComposer
 
             $fieldPath = $this->getAttributePathForOrderBy($entity, $field, $params);
 
-
             $listQuoted = [];
 
             $list = array_reverse(explode(',', $list));