diff --git a/application/Espo/Controllers/EmailTemplate.php b/application/Espo/Controllers/EmailTemplate.php
index f1c4e9bb94..d4f8266bc7 100644
--- a/application/Espo/Controllers/EmailTemplate.php
+++ b/application/Espo/Controllers/EmailTemplate.php
@@ -29,20 +29,22 @@
 
 namespace Espo\Controllers;
 
+use Espo\Services\EmailTemplate as Service;
+
 use Espo\Core\{
     Controllers\Record,
     Api\Request,
 };
 
-use StdClass;
+use stdClass;
 
 class EmailTemplate extends Record
 {
-    public function actionParse(Request $request): StdClass
+    public function actionParse(Request $request): stdClass
     {
         $id = $request->getQueryParam('id');
 
-        return (object) $this->getRecordService()->parse(
+        return (object) $this->getEmailTempalteService()->parse(
             $id,
             [
                 'emailAddress' => $request->getQueryParam('emailAddress'),
@@ -54,4 +56,9 @@ class EmailTemplate extends Record
             true
         );
     }
+
+    private function getEmailTempalteService(): Service
+    {
+        return $this->getRecordService();
+    }
 }
diff --git a/application/Espo/Controllers/Notification.php b/application/Espo/Controllers/Notification.php
index 4c62d1a858..3372d26e79 100644
--- a/application/Espo/Controllers/Notification.php
+++ b/application/Espo/Controllers/Notification.php
@@ -50,7 +50,7 @@ class Notification extends RecordBase
         $offset = $searchParams->getOffset();
         $maxSize = $searchParams->getMaxSize();
 
-        $after = $request->get('after');
+        $after = $request->getQueryParam('after');
 
         $params = [
             'offset' => $offset,
diff --git a/application/Espo/Controllers/Stream.php b/application/Espo/Controllers/Stream.php
index da88a997b9..470aeebf3e 100644
--- a/application/Espo/Controllers/Stream.php
+++ b/application/Espo/Controllers/Stream.php
@@ -66,9 +66,9 @@ class Stream
         $offset = $searchParams->getOffset();
         $maxSize = $searchParams->getMaxSize();
 
-        $after = $request->get('after');
-        $filter = $request->get('filter');
-        $skipOwn = $request->get('skipOwn') === 'true';
+        $after = $request->getQueryParam('after');
+        $filter = $request->getQueryParam('filter');
+        $skipOwn = $request->getQueryParam('skipOwn') === 'true';
 
         $result = $this->service->find($scope, $id, [
             'offset' => $offset,
@@ -96,9 +96,8 @@ class Stream
         $offset = $searchParams->getOffset();
         $maxSize = $searchParams->getMaxSize();
 
-        $after = $request->get('after');
-
-        $where = $request->get('where');
+        $after = $request->getQueryParam('after');
+        $where = $request->getQueryParam('where');
 
         $result = $this->service->find($scope, $id, [
             'offset' => $offset,
diff --git a/application/Espo/Controllers/User.php b/application/Espo/Controllers/User.php
index 7962a2eac4..5a17a89779 100644
--- a/application/Espo/Controllers/User.php
+++ b/application/Espo/Controllers/User.php
@@ -34,6 +34,8 @@ use Espo\Core\Exceptions\NotFound;
 use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\BadRequest;
 
+use Espo\Services\User as Service;
+
 use Espo\Core\{
     Controllers\Record,
     Api\Request,
@@ -41,11 +43,11 @@ use Espo\Core\{
     Select\Where\Item as WhereItem,
 };
 
-use StdClass;
+use stdClass;
 
 class User extends Record
 {
-    public function getActionAcl(Request $request): StdClass
+    public function getActionAcl(Request $request): stdClass
     {
         $userId = $request->getQueryParam('id');
 
@@ -53,7 +55,7 @@ class User extends Record
             throw new Error();
         }
 
-        if (!$this->user->isAdmin() && $this->user->getId() != $userId) {
+        if (!$this->user->isAdmin() && $this->user->getId() !== $userId) {
             throw new Forbidden();
         }
 
@@ -77,18 +79,17 @@ class User extends Record
             throw new BadRequest();
         }
 
-        $this->getService('User')
-            ->changePassword(
-                $this->user->getId(),
-                $data->password,
-                true,
-                $data->currentPassword
-            );
+        $this->getUserService()->changePassword(
+            $this->user->getId(),
+            $data->password,
+            true,
+            $data->currentPassword
+        );
 
         return true;
     }
 
-    public function postActionChangePasswordByRequest(Request $request): StdClass
+    public function postActionChangePasswordByRequest(Request $request): stdClass
     {
         $data = $request->getParsedBody();
 
@@ -96,7 +97,7 @@ class User extends Record
             throw new BadRequest();
         }
 
-        return $this->getService('User')->changePasswordByRequest($data->requestId, $data->password);
+        return $this->getUserService()->changePasswordByRequest($data->requestId, $data->password);
     }
 
     public function postActionPasswordChangeRequest(Request $request): bool
@@ -116,12 +117,12 @@ class User extends Record
             $url = $data->url;
         }
 
-        $this->getService('User')->passwordChangeRequest($userName, $emailAddress, $url);
+        $this->getUserService()->passwordChangeRequest($userName, $emailAddress, $url);
 
         return true;
     }
 
-    public function postActionGenerateNewApiKey(Request $request): StdClass
+    public function postActionGenerateNewApiKey(Request $request): stdClass
     {
         $data = $request->getParsedBody();
 
@@ -133,7 +134,7 @@ class User extends Record
             throw new Forbidden();
         }
 
-        return $this->getRecordService()
+        return $this->getUserService()
             ->generateNewApiKeyForEntity($data->id)
             ->getValueMap();
     }
@@ -150,7 +151,7 @@ class User extends Record
             throw new Forbidden();
         }
 
-        $this->getRecordService()->generateNewPasswordForUser($data->id);
+        $this->getUserService()->generateNewPasswordForUser($data->id);
 
         return true;
     }
@@ -187,4 +188,9 @@ class User extends Record
             ])
         );
     }
+
+    private function getUserService(): Service
+    {
+        return $this->getServiceFactory()->create('User');
+    }
 }