diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index eef8accc63..5d39ac7f4d 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -53,6 +53,7 @@ use LogicException;
  */
 abstract class BaseQueryComposer implements QueryComposer
 {
+    // @todo Remove.
     protected static $paramList = [
         'select',
         'whereClause',
@@ -845,7 +846,7 @@ abstract class BaseQueryComposer implements QueryComposer
         if (substr($rest, 0, 1) === '(' && substr($rest, -1) === ')') {
             $rest = substr($rest, 1, -1);
 
-            $argumentList = self::parseArgumentListFromFunctionContent($rest);
+            $argumentList = Util::parseArgumentListFromFunctionContent($rest);
             if (count($argumentList) < 2) {
                 throw new RuntimeException("ORM Query: Bad MATCH usage.");
             }
@@ -916,7 +917,7 @@ abstract class BaseQueryComposer implements QueryComposer
         if ($function && in_array($function, Functions::$multipleArgumentsFunctionList)) {
             $arguments = $attribute;
 
-            $argumentList = self::parseArgumentListFromFunctionContent($arguments);
+            $argumentList = Util::parseArgumentListFromFunctionContent($arguments);
 
             $argumentPartList = [];
             foreach ($argumentList as $argument) {
@@ -938,104 +939,7 @@ abstract class BaseQueryComposer implements QueryComposer
 
     public static function getAllAttributesFromComplexExpression(string $expression) : array
     {
-        return self::getAllAttributesFromComplexExpressionImplementation($expression);
-    }
-
-    protected static function getAllAttributesFromComplexExpressionImplementation(
-        string $expression, ?array &$list = null
-    ) : array {
-        if (!$list) $list = [];
-
-        $arguments = $expression;
-
-        if (strpos($expression, ':')) {
-            $dilimeterPosition = strpos($expression, ':');
-            $function = substr($expression, 0, $dilimeterPosition);
-            $arguments = substr($expression, $dilimeterPosition + 1);
-            if (substr($arguments, 0, 1) === '(' && substr($arguments, -1) === ')') {
-                $arguments = substr($arguments, 1, -1);
-            }
-        } else {
-            if (
-                !self::isArgumentString($expression) &&
-                !self::isArgumentNumeric($expression) &&
-                !self::isArgumentBoolOrNull($expression)
-            ) {
-                $list[] = $expression;
-            }
-            return $list;
-        }
-
-        $argumentList = self::parseArgumentListFromFunctionContent($arguments);
-
-        foreach ($argumentList as $argument) {
-            self::getAllAttributesFromComplexExpressionImplementation($argument, $list);
-        }
-
-        return $list;
-    }
-
-    static protected function parseArgumentListFromFunctionContent(string $functionContent)
-    {
-        $functionContent = trim($functionContent);
-
-        $isString = false;
-        $isSingleQuote = false;
-
-        if ($functionContent === '') {
-            return [];
-        }
-
-        $commaIndexList = [];
-        $braceCounter = 0;
-        for ($i = 0; $i < strlen($functionContent); $i++) {
-            if ($functionContent[$i] === "'" && ($i === 0 || $functionContent[$i - 1] !== "\\")) {
-                if (!$isString) {
-                    $isString = true;
-                    $isSingleQuote = true;
-                } else {
-                    if ($isSingleQuote) {
-                        $isString = false;
-                    }
-                }
-            } else if ($functionContent[$i] === "\"" && ($i === 0 || $functionContent[$i - 1] !== "\\")) {
-                if (!$isString) {
-                    $isString = true;
-                    $isSingleQuote = false;
-                } else {
-                    if (!$isSingleQuote) {
-                        $isString = false;
-                    }
-                }
-            }
-
-            if (!$isString) {
-                if ($functionContent[$i] === '(') {
-                    $braceCounter++;
-                } else if ($functionContent[$i] === ')') {
-                    $braceCounter--;
-                }
-            }
-
-            if ($braceCounter === 0 && !$isString && $functionContent[$i] === ',') {
-                $commaIndexList[] = $i;
-            }
-        }
-
-        $commaIndexList[] = strlen($functionContent);
-
-        $argumentList = [];
-        for ($i = 0; $i < count($commaIndexList); $i++) {
-            if ($i > 0) {
-                $previousCommaIndex = $commaIndexList[$i - 1] + 1;
-            } else {
-                $previousCommaIndex = 0;
-            }
-            $argument = trim(substr($functionContent, $previousCommaIndex, $commaIndexList[$i] - $previousCommaIndex));
-            $argumentList[] = $argument;
-        }
-
-        return $argumentList;
+        return Util::getAllAttributesFromComplexExpression($expression);
     }
 
     protected static function isArgumentString(string $argument)
@@ -1056,18 +960,21 @@ abstract class BaseQueryComposer implements QueryComposer
         return in_array(strtoupper($argument), ['NULL', 'TRUE', 'FALSE']);
     }
 
-    protected function getFunctionArgumentPart($entity, $attribute, $distinct = false, &$params = null)
-    {
+    protected function getFunctionArgumentPart(
+        Entity $entity, string $attribute, bool $distinct = false, ?array &$params = null
+    ) :string {
         $argument = $attribute;
 
-        if (self::isArgumentString($argument)) {
+        if (Util::isArgumentString($argument)) {
             $string = substr($argument, 1, -1);
             $string = $this->quote($string);
             return $string;
-        } else if (self::isArgumentNumeric($argument)) {
+        }
+        else if (Util::isArgumentNumeric($argument)) {
             $string = $this->quote($argument);
             return $string;
-        } else if (self::isArgumentBoolOrNull($argument)) {
+        }
+        else if (Util::isArgumentBoolOrNull($argument)) {
             return strtoupper($argument);
         }
 
diff --git a/application/Espo/ORM/QueryComposer/Util.php b/application/Espo/ORM/QueryComposer/Util.php
new file mode 100644
index 0000000000..e066cdf0bb
--- /dev/null
+++ b/application/Espo/ORM/QueryComposer/Util.php
@@ -0,0 +1,157 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\ORM\QueryComposer;
+
+class Util
+{
+    public static function isArgumentString(string $argument) : bool
+    {
+        return
+            substr($argument, 0, 1) === '\'' && substr($argument, -1) === '\''
+            ||
+            substr($argument, 0, 1) === '"' && substr($argument, -1) === '"';
+    }
+
+    public static function isArgumentNumeric(string $argument) : bool
+    {
+        return is_numeric($argument);
+    }
+
+    public static function isArgumentBoolOrNull(string $argument) : bool
+    {
+        return in_array(strtoupper($argument), ['NULL', 'TRUE', 'FALSE']);
+    }
+
+    public static function getAllAttributesFromComplexExpression(string $expression) : array
+    {
+        return self::getAllAttributesFromComplexExpressionImplementation($expression);
+    }
+
+    protected static function getAllAttributesFromComplexExpressionImplementation(
+        string $expression, ?array &$list = null
+    ) : array {
+        if (!$list) {
+            $list = [];
+        }
+
+        $arguments = $expression;
+
+        if (strpos($expression, ':')) {
+            $dilimeterPosition = strpos($expression, ':');
+            $function = substr($expression, 0, $dilimeterPosition);
+            $arguments = substr($expression, $dilimeterPosition + 1);
+            if (substr($arguments, 0, 1) === '(' && substr($arguments, -1) === ')') {
+                $arguments = substr($arguments, 1, -1);
+            }
+        } else {
+            if (
+                !self::isArgumentString($expression) &&
+                !self::isArgumentNumeric($expression) &&
+                !self::isArgumentBoolOrNull($expression)
+            ) {
+                $list[] = $expression;
+            }
+            return $list;
+        }
+
+        $argumentList = self::parseArgumentListFromFunctionContent($arguments);
+
+        foreach ($argumentList as $argument) {
+            self::getAllAttributesFromComplexExpressionImplementation($argument, $list);
+        }
+
+        return $list;
+    }
+
+    static public function parseArgumentListFromFunctionContent(string $functionContent) : array
+    {
+        $functionContent = trim($functionContent);
+
+        $isString = false;
+        $isSingleQuote = false;
+
+        if ($functionContent === '') {
+            return [];
+        }
+
+        $commaIndexList = [];
+        $braceCounter = 0;
+
+        for ($i = 0; $i < strlen($functionContent); $i++) {
+            if ($functionContent[$i] === "'" && ($i === 0 || $functionContent[$i - 1] !== "\\")) {
+                if (!$isString) {
+                    $isString = true;
+                    $isSingleQuote = true;
+                } else {
+                    if ($isSingleQuote) {
+                        $isString = false;
+                    }
+                }
+            } else if ($functionContent[$i] === "\"" && ($i === 0 || $functionContent[$i - 1] !== "\\")) {
+                if (!$isString) {
+                    $isString = true;
+                    $isSingleQuote = false;
+                } else {
+                    if (!$isSingleQuote) {
+                        $isString = false;
+                    }
+                }
+            }
+
+            if (!$isString) {
+                if ($functionContent[$i] === '(') {
+                    $braceCounter++;
+                } else if ($functionContent[$i] === ')') {
+                    $braceCounter--;
+                }
+            }
+
+            if ($braceCounter === 0 && !$isString && $functionContent[$i] === ',') {
+                $commaIndexList[] = $i;
+            }
+        }
+
+        $commaIndexList[] = strlen($functionContent);
+
+        $argumentList = [];
+
+        for ($i = 0; $i < count($commaIndexList); $i++) {
+            if ($i > 0) {
+                $previousCommaIndex = $commaIndexList[$i - 1] + 1;
+            } else {
+                $previousCommaIndex = 0;
+            }
+            $argument = trim(substr($functionContent, $previousCommaIndex, $commaIndexList[$i] - $previousCommaIndex));
+            $argumentList[] = $argument;
+        }
+
+        return $argumentList;
+    }
+}