diff --git a/rest/index.php b/rest/index.php
index 590da08873d414756ce8c47570a6a140efd31f0d..cbcfe80c797f6e31f5a705761d8e20af639c824b 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -369,8 +369,8 @@ $app->post('/resources/{resId}/linkedResources', \Resource\controllers\LinkContr
 $app->delete('/resources/{resId}/linkedResources/{id}', \Resource\controllers\LinkController::class . ':unlinkResources');
 $app->put('/resources/{resId}/sign', \SignatureBook\controllers\SignatureBookController::class . ':signResource');
 $app->put('/resources/{resId}/unsign', \SignatureBook\controllers\SignatureBookController::class . ':unsignResource');
-$app->get('/resources/{resId}/acknowledgementReceipts', \AcknowledgementReceipt\controllers\AcknowledgementReceiptController::class . ':get');
-$app->get('/resources/{resId}/shippings', \Shipping\controllers\ShippingController::class . ':get');
+$app->get('/resources/{resId}/acknowledgementReceipts', \AcknowledgementReceipt\controllers\AcknowledgementReceiptController::class . ':getByResId');
+$app->get('/resources/{resId}/shippings', \Shipping\controllers\ShippingController::class . ':getByResId');
 
 $app->put('/res/resource/status', \Resource\controllers\ResController::class . ':updateStatus');
 $app->post('/res/list', \Resource\controllers\ResController::class . ':getList');
diff --git a/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php b/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php
index dc91fd368c881bf15c4474f2b3ef9c5b48f24bc6..59cd3bf9056386d86ea1e0c5bd4369559a5736cb 100644
--- a/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php
+++ b/src/app/acknowledgementReceipt/controllers/AcknowledgementReceiptController.php
@@ -29,7 +29,7 @@ use User\models\UserModel;
 
 class AcknowledgementReceiptController
 {
-    public static function get(Request $request, Response $response, array $args)
+    public static function getByResId(Request $request, Response $response, array $args)
     {
         if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
             return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
diff --git a/src/app/shipping/controllers/ShippingController.php b/src/app/shipping/controllers/ShippingController.php
index a2113788c81db99f0d46c563a464cf9e459d8bd8..d96e4233ee2d7c87012935f5192f4b9f3cd9b310 100644
--- a/src/app/shipping/controllers/ShippingController.php
+++ b/src/app/shipping/controllers/ShippingController.php
@@ -25,7 +25,7 @@ use User\models\UserModel;
 
 class ShippingController
 {
-    public static function get(Request $request, Response $response, array $args)
+    public static function getByResId(Request $request, Response $response, array $args)
     {
         if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
             return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
diff --git a/src/app/shipping/models/ShippingModel.php b/src/app/shipping/models/ShippingModel.php
index 5feff4037b26ede263a7d3871e80e611c85dba92..670e0aa7546289e10e9002065c8226f01ca5a0df 100644
--- a/src/app/shipping/models/ShippingModel.php
+++ b/src/app/shipping/models/ShippingModel.php
@@ -48,7 +48,7 @@ class ShippingModel
         ValidatorModel::arrayType($args, ['select', 'where', 'data', 'orderBy']);
         ValidatorModel::intType($args, ['limit']);
 
-        $contacts = DatabaseModel::select([
+        $shippings = DatabaseModel::select([
             'select'    => $args['select'],
             'table'     => ['shippings'],
             'where'     => empty($args['where']) ? [] : $args['where'],
@@ -58,6 +58,6 @@ class ShippingModel
             'limit'     => empty($args['limit']) ? 0 : $args['limit']
         ]);
 
-        return $contacts;
+        return $shippings;
     }
 }
diff --git a/src/app/template/controllers/TemplateController.php b/src/app/template/controllers/TemplateController.php
index c75fd5006ec2dd95b3962168778f644a6f50c46f..dddaaf940ae3b59a82c875ec4ce2002e8659213e 100755
--- a/src/app/template/controllers/TemplateController.php
+++ b/src/app/template/controllers/TemplateController.php
@@ -458,13 +458,9 @@ class TemplateController
 
         $queryParams = $request->getQueryParams();
 
-        if (!empty($queryParams['attachmentType'])) {
-            $where[] = 'templates.template_attachment_type in (?)';
-            $data[] = explode(',', $queryParams['attachmentType']);
-        }
 
         $templates = TemplateModel::getWithAssociation([
-            'select'    => ['DISTINCT(templates.template_id)', 'templates.template_label', 'templates.template_file_name', 'templates.template_path', 'templates.template_attachment_type'],
+            'select'    => ['DISTINCT(templates.template_id)', 'templates.template_label'],
             'where'     => $where,
             'data'      => $data,
             'orderBy'   => ['templates.template_label']
@@ -473,8 +469,7 @@ class TemplateController
         foreach ($templates as $key => $template) {
             $templates[$key] = [
                 'id'                => $template['template_id'],
-                'label'             => $template['template_label'],
-                'attachmentType'    => $template['template_attachment_type']
+                'label'             => $template['template_label']
             ];
         }
 
diff --git a/src/core/controllers/AutoCompleteController.php b/src/core/controllers/AutoCompleteController.php
index 4924dffa91ba4b8c8659c44df5e63ed658b2fb99..a9ac798642cf9a793b5cc0b775d2aa23462059a0 100755
--- a/src/core/controllers/AutoCompleteController.php
+++ b/src/core/controllers/AutoCompleteController.php
@@ -171,7 +171,7 @@ class AutoCompleteController
             }
 
             if ($searchOnEmails && !in_array('email', $fields)) {
-                $fields[] = 'emails';
+                $fields[] = 'email';
             }
 
             $fieldsNumber = count($fields);