diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 0fc7eea66a9121cc302bad42202ba1b3df6521c8..1ace78a68e9b95140ce208832ab9c5f582a3bf30 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -563,9 +563,8 @@ class ResController extends ResourceControlController
 
         $convertedDocument = AdrModel::getDocuments([
             'select'    => ['docserver_id', 'path', 'filename', 'fingerprint'],
-            'where'     => ['res_id = ?', 'type in (?)', 'version = ?'],
-            'data'      => [$args['resId'], ['SIGN'], $document['version']],
-            'orderBy'   => ["type='SIGN' DESC"],
+            'where'     => ['res_id = ?', 'type = ?', 'version = ?'],
+            'data'      => [$args['resId'], 'SIGN', $document['version']],
             'limit'     => 1
         ]);
         $document = $convertedDocument[0] ?? $document;
diff --git a/src/app/tag/controllers/TagController.php b/src/app/tag/controllers/TagController.php
index 21e6ee263c332c03cbaaffa310aae04c630307e2..9718442703d69e0505e5455699df33767e9e09ec 100644
--- a/src/app/tag/controllers/TagController.php
+++ b/src/app/tag/controllers/TagController.php
@@ -69,12 +69,12 @@ class TagController
         $tag['links'] = json_decode($tag['links'], true);
 
         $childTags = TagModel::get([
-            'select' => ['count(1)'],
+            'select' => [1],
             'where'  => ['parent_id = ?'],
             'data'   => [$tag['id']]
         ]);
 
-        $tag['canMerge'] = empty($tag['parent_id']) && $childTags[0]['count'] == 0;
+        $tag['canMerge'] = empty($tag['parent_id']) && empty($childTags[0]['count']);
 
         return $response->withJson($tag);
     }
diff --git a/src/frontend/app/administration/tag/tag-administration.component.ts b/src/frontend/app/administration/tag/tag-administration.component.ts
index 426a0e803fd3abeb9ea31e3c682027fd2f6a01f7..caf0a4b6dedbc58845cf2beb03b1e3b9cde14583 100644
--- a/src/frontend/app/administration/tag/tag-administration.component.ts
+++ b/src/frontend/app/administration/tag/tag-administration.component.ts
@@ -155,7 +155,7 @@ export class TagAdministrationComponent implements OnInit {
         this.selectMergeTag.reset();
         const selectedTag = this.tags.filter(tag => tag.id === tagId)[0];
 
-        const dialogMessage = `${this.lang.confirmAction}<br/><br/>${this.lang.theTag}<b> "${this.tag.label.value}" </b>${this.lang.willBeDeletedAndMerged}<b> "${selectedTag.label}"</b><br/><b>${this.tag.countResources.value}</b>&nbsp;${this.lang.mails} ${this.lang.willBeTransferredToNewTag}<b> "${selectedTag.label}"</b>`;
+        const dialogMessage = `${this.lang.confirmAction}<br/><br/>${this.lang.theTag}<b> "${this.tag.label.value}" </b>${this.lang.willBeDeletedAndMerged}<b> "${selectedTag.label}"</b><br/><br/><b>${this.tag.countResources.value}</b>&nbsp;${this.lang.mails} ${this.lang.willBeTransferredToNewTag}<b> "${selectedTag.label}"</b>`;
 
         const dialogRef = this.dialog.open(ConfirmComponent, { autoFocus: false, disableClose: true, data: { title: `${this.lang.mergeWith}  "${selectedTag.label}"`, msg: dialogMessage } });
         dialogRef.afterClosed().pipe(
diff --git a/src/frontend/app/notification.service.html b/src/frontend/app/notification.service.html
index 8848a2ce402ea89541aef45bc9e466efaa13bcfb..18b2d1fe925c8e32772942771d3500baa4666588 100644
--- a/src/frontend/app/notification.service.html
+++ b/src/frontend/app/notification.service.html
@@ -1,10 +1,7 @@
-<div class="notif-container">
+<div class="notif-container" (click)="dismiss()">
     <div class="notif-container-icon">
         <i class="fa fa-{{data.icon}} fa-2x"></i>
     </div>
-    <button mat-icon-button class="notif-container-close" (click)="dismiss()">
-        <mat-icon class="fa fa-times fa-lg" aria-hidden="true"></mat-icon>
-    </button>
     <div class="notif-container-content">
         <div class="notif-container-content-msg">
             <div [innerHTML]="data.url"></div>
diff --git a/src/frontend/app/notification.service.scss b/src/frontend/app/notification.service.scss
index 9cfba9814537672655804289bb5c642c2c8f8df5..c3a8a3a9dd38d0b5ba04248f2d451f448c3c6a0e 100644
--- a/src/frontend/app/notification.service.scss
+++ b/src/frontend/app/notification.service.scss
@@ -6,6 +6,8 @@
     padding-top: 25px;
     padding-bottom: 25px;
 
+    cursor: pointer;
+
     &-icon {
         display: flex;
         width:50px;
@@ -22,12 +24,6 @@
             flex-direction: column;
         }
     }
-
-    &-close {
-        position: absolute;
-        top: 5px;
-        right: 5px;
-    }
 }
 
 ::ng-deep.mat-snack-bar-container.error-snackbar  {
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 09b93e7173f6698a50b2edf4a8f7b473212e5ddc..848bb7c6c83caa2558a99c127460edbe40793543 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1590,7 +1590,7 @@ export const LANG_FR = {
     "tagUpdated" : "Mot-clé modifié",
     "tagMerged" : "Mot-clé fusionné",
     "mergeWith" : "Fusionner avec",
-    "willBeTransferredToNewTag" : "seront transférés au mot clé ",
+    "willBeTransferredToNewTag" : "seront transférés au mot-clé ",
     "detailDoc" : "Fiche détaillée",
     "emptySubject" : "Objet vide",
     "noAvailableMenu" : "Aucun menu disponible",
@@ -1599,7 +1599,7 @@ export const LANG_FR = {
     "sentToFastParapheur" : "Envoyer à fastParapheur",
     "editAcknowledgementReceipt" : "Editer l'accusé de réception",
     "insufficientPrivilege" : "Privilège insuffisant",
-    "cannotMergeTags" : "Ce mot-clé possède un parent ou des enfants : impossible de le fusionner avec un autre mot clé.",
+    "cannotMergeTags" : "Ce mot-clé possède un parent ou des enfants : impossible de le fusionner avec un autre mot-clé.",
     "mergeTagWith" : "Fusionner le mot-clé avec",
     "generateAndDownloadPrintedFolder" : "Générer le dossier d'impression",
     "printedFolder" : "Dossier d'impression",