diff --git a/modules/attachments/attachments_content.php b/modules/attachments/attachments_content.php
index 9230e021a1f93baa4a90e5ce23df39a9ae334871..09bffa10520f4ee5926388c57b8dc8d44dc3389b 100755
--- a/modules/attachments/attachments_content.php
+++ b/modules/attachments/attachments_content.php
@@ -1020,7 +1020,6 @@ if (isset($_POST['add']) && $_POST['add']) {
             if ($_SESSION['upfile'][0]['fileNamePdfOnTmp'] != '' && $_SESSION['upfile'][0]['upAttachment'] != false) {
                 \Convert\models\AdrModel::deleteAttachAdr([
                     'resId'         => $_REQUEST['res_id'],
-                    'isVersion'     => false
                 ]);
             }
         } else {
@@ -1028,7 +1027,6 @@ if (isset($_POST['add']) && $_POST['add']) {
             if ($_SESSION['upfile'][0]['fileNamePdfOnTmp'] != '' && $_SESSION['upfile'][0]['upAttachment'] != false) {
                 \Convert\models\AdrModel::deleteAttachAdr([
                     'resId'         => $_REQUEST['res_id'],
-                    'isVersion'     => true
                 ]);
             }
         }
diff --git a/src/app/attachment/models/AttachmentModelAbstract.php b/src/app/attachment/models/AttachmentModelAbstract.php
index 6271db4e213224380af504ad3d7ba0f5f572496e..fc1e47b0e08a54552709b0b0e21694ba4b16cc89 100755
--- a/src/app/attachment/models/AttachmentModelAbstract.php
+++ b/src/app/attachment/models/AttachmentModelAbstract.php
@@ -23,7 +23,7 @@ abstract class AttachmentModelAbstract
     public static function get(array $aArgs)
     {
         ValidatorModel::notEmpty($aArgs, ['select']);
-        ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']);
+        ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy', 'groupBy']);
         ValidatorModel::intType($aArgs, ['limit']);
 
         $attachments = DatabaseModel::select([
@@ -32,6 +32,7 @@ abstract class AttachmentModelAbstract
             'where'     => empty($aArgs['where']) ? [] : $aArgs['where'],
             'data'      => empty($aArgs['data']) ? [] : $aArgs['data'],
             'order_by'  => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
+            'groupBy'   => empty($aArgs['groupBy']) ? [] : $aArgs['groupBy'],
             'limit'     => empty($aArgs['limit']) ? 0 : $aArgs['limit']
         ]);
 
diff --git a/src/app/convert/controllers/ConvertThumbnailController.php b/src/app/convert/controllers/ConvertThumbnailController.php
index 9627e3ee6b55632ec7f597cafb4de337584cff15..bdefdc66173d380588f157e2f72cf7434253a509 100755
--- a/src/app/convert/controllers/ConvertThumbnailController.php
+++ b/src/app/convert/controllers/ConvertThumbnailController.php
@@ -135,8 +135,7 @@ class ConvertThumbnailController
                 'type'          => 'TNL',
                 'docserverId'   => $storeResult['docserver_id'],
                 'path'          => $storeResult['destination_dir'],
-                'filename'      => $storeResult['file_destination_name'],
-                'isVersion'     => $aArgs['isVersion'],
+                'filename'      => $storeResult['file_destination_name']
             ]);
         }
 
diff --git a/src/app/convert/models/AdrModel.php b/src/app/convert/models/AdrModel.php
index 510fa5993e7094dbc09e8810c090bb1e3e8e6fd1..c3271e7c316ba1e6d18fafa92d2bb60916cbb769 100755
--- a/src/app/convert/models/AdrModel.php
+++ b/src/app/convert/models/AdrModel.php
@@ -23,47 +23,26 @@ class AdrModel
     {
         ValidatorModel::notEmpty($aArgs, ['resId', 'type', 'collId']);
         ValidatorModel::intVal($aArgs, ['resId']);
-        ValidatorModel::boolType($aArgs, ['isVersion']);
         ValidatorModel::arrayType($aArgs, ['select']);
 
         if ($aArgs['collId'] == 'letterbox_coll') {
             $table = "adr_letterbox";
-        } else if ($aArgs['collId'] == 'attachments_version_coll' || $aArgs['isVersion']) {
-            $table = "adr_attachments_version";
         } else {
             $table = "adr_attachments";
         }
 
-        $attachment = DatabaseModel::select([
+        $document = DatabaseModel::select([
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
             'table'     => [$table],
             'where'     => ['res_id = ?', 'type = ?'],
             'data'      => [$aArgs['resId'], $aArgs['type']],
         ]);
 
-        if (empty($attachment[0])) {
+        if (empty($document[0])) {
             return [];
         }
 
-        return $attachment[0];
-    }
-
-    public static function getDocumentsAdr(array $aArgs = [])
-    {
-        ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']);
-        ValidatorModel::intType($aArgs, ['limit', 'offset']);
-
-        $aReturn = DatabaseModel::select([
-            'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
-            'table'     => ['adr_letterbox'],
-            'where'     => empty($aArgs['where']) ? [] : $aArgs['where'],
-            'data'      => empty($aArgs['data']) ? [] : $aArgs['data'],
-            'order_by'  => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
-            'offset'    => empty($aArgs['offset']) ? 0 : $aArgs['offset'],
-            'limit'     => empty($aArgs['limit']) ? 0 : $aArgs['limit']
-        ]);
-
-        return $aReturn;
+        return $document[0];
     }
 
     public static function getTypedDocumentAdrByResId(array $aArgs)
@@ -93,17 +72,10 @@ class AdrModel
         ValidatorModel::intVal($aArgs, ['resId']);
         ValidatorModel::stringType($aArgs, ['type']);
         ValidatorModel::arrayType($aArgs, ['select']);
-        ValidatorModel::boolType($aArgs, ['isVersion']);
-
-        if ($aArgs['isVersion']) {
-            $table = "adr_attachments_version";
-        } else {
-            $table = "adr_attachments";
-        }
 
         $adr = DatabaseModel::select([
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
-            'table'     => [$table],
+            'table'     => ['adr_attachments'],
             'where'     => ['res_id = ?', 'type = ?'],
             'data'      => [$aArgs['resId'], $aArgs['type']]
         ]);
@@ -141,16 +113,9 @@ class AdrModel
         ValidatorModel::notEmpty($aArgs, ['resId', 'docserverId', 'path', 'filename', 'type']);
         ValidatorModel::stringType($aArgs, ['docserverId', 'path', 'filename', 'type', 'fingerprint']);
         ValidatorModel::intVal($aArgs, ['resId']);
-        ValidatorModel::boolType($aArgs, ['isVersion']);
-
-        if ($aArgs['isVersion']) {
-            $table = "adr_attachments_version";
-        } else {
-            $table = "adr_attachments";
-        }
 
         DatabaseModel::insert([
-            'table'         => $table,
+            'table'         => 'adr_attachments',
             'columnsValues' => [
                 'res_id'        => $aArgs['resId'],
                 'type'          => $aArgs['type'],
@@ -163,33 +128,6 @@ class AdrModel
         return true;
     }
 
-    public static function updateAttachAdr(array $aArgs)
-    {
-        ValidatorModel::notEmpty($aArgs, ['resId', 'path', 'filename', 'type']);
-        ValidatorModel::stringType($aArgs, ['path', 'filename', 'type', 'fingerprint']);
-        ValidatorModel::intVal($aArgs, ['resId']);
-        ValidatorModel::boolType($aArgs, ['isVersion']);
-
-        if ($aArgs['isVersion']) {
-            $table = "adr_attachments_version";
-        } else {
-            $table = "adr_attachments";
-        }
-
-        DatabaseModel::update([
-            'table'     => $table,
-            'set'       => [
-                'path'    => $aArgs['path'],
-                'filename'    => $aArgs['filename'],
-                'fingerprint'    => empty($aArgs['fingerprint']) ? null : $aArgs['fingerprint'],
-            ],
-            'where'     => ['res_id = ?', 'type = ?'],
-            'data'      => [$aArgs['resId'],$aArgs['type']]
-        ]);
-
-        return true;
-    }
-
     public static function deleteDocumentAdr(array $aArgs)
     {
         ValidatorModel::notEmpty($aArgs, ['where', 'data']);
@@ -208,16 +146,9 @@ class AdrModel
     {
         ValidatorModel::notEmpty($aArgs, ['resId']);
         ValidatorModel::intVal($aArgs, ['resId']);
-        ValidatorModel::boolType($aArgs, ['isVersion']);
-
-        if ($aArgs['isVersion']) {
-            $table = "adr_attachments_version";
-        } else {
-            $table = "adr_attachments";
-        }
 
         DatabaseModel::delete([
-            'table' => $table,
+            'table' => 'adr_attachments',
             'where'     => ['res_id = ?'],
             'data'      => [$aArgs['resId']]
         ]);