diff --git a/src/app/template/controllers/TemplateController.php b/src/app/template/controllers/TemplateController.php
index 8ea8c0cf856f6832b52fc0be79cb49d30401c66b..46b024f76270202bc4a37ad1564a0ee3bc3d1c07 100755
--- a/src/app/template/controllers/TemplateController.php
+++ b/src/app/template/controllers/TemplateController.php
@@ -191,7 +191,7 @@ class TemplateController
             return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
         }
 
-        $template = TemplateModel::getById(['select' => ['template_style', 'template_file_name', 'template_type', 'template_target', 'subject'], 'id' => $aArgs['id']]);
+        $template = TemplateModel::getById(['select' => ['template_type', 'template_target'], 'id' => $aArgs['id']]);
         if (empty($template)) {
             return $response->withStatus(400)->withJson(['errors' => 'Template does not exist']);
         }
diff --git a/src/frontend/app/administration/group/group-administration.component.html b/src/frontend/app/administration/group/group-administration.component.html
index 600e393f3b342e762d5bb5e05005a1cdecde101b..6de18d70a556da21117adad3f390d270279ff1f4 100755
--- a/src/frontend/app/administration/group/group-administration.component.html
+++ b/src/frontend/app/administration/group/group-administration.component.html
@@ -154,7 +154,7 @@
                                 <div class="col-md-12" *ngIf="group.canAdminUsers" style="padding:5px;">
                                     <plugin-autocomplete [labelPlaceholder]="lang.linkUser"
                                                          [labelList]="lang.availableUsers" [routeDatas]="['/rest/autocomplete/users/administration']"
-                                                         [targetSearchKey]="'idToDisplay'" [subInfoKey]="'id'"
+                                                         [targetSearchKey]="'idToDisplay'"
                                                          (triggerEvent)="linkUser($event)"></plugin-autocomplete>
                                     <hr />
                                 </div>
diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts
index 15ea18f14bfb42da8b5d016edee9014cc4046af0..298abcc2f6732c26aaeb929de40726b916dec5a1 100755
--- a/src/frontend/app/viewer/document-viewer.component.ts
+++ b/src/frontend/app/viewer/document-viewer.component.ts
@@ -607,6 +607,7 @@ export class DocumentViewerComponent implements OnInit, OnDestroy {
                         this.file.contentView = `../rest/attachments/${resId}/content?mode=base64`;
                         this.file.src = this.base64ToArrayBuffer(data.encodedDocument);
                         this.loading = false;
+                        this.noFile = false;
                     }
                 },
                 (err: any) => {
@@ -646,6 +647,7 @@ export class DocumentViewerComponent implements OnInit, OnDestroy {
                             this.file.contentView = `../rest/resources/${resId}/content?mode=base64`;
                             this.file.src = this.base64ToArrayBuffer(data.encodedDocument);
                             this.loading = false;
+                            this.noFile = false;
                         }
                     },
                     (err: any) => {
diff --git a/src/frontend/plugins/collabora-online/collabora-online-viewer.component.html b/src/frontend/plugins/collabora-online/collabora-online-viewer.component.html
index 8ea62b21923955f27baad333e603c7e714c0575a..5b4e573dd30d66e40a081d46b2b8691dc61a3bd2 100644
--- a/src/frontend/plugins/collabora-online/collabora-online-viewer.component.html
+++ b/src/frontend/plugins/collabora-online/collabora-online-viewer.component.html
@@ -8,7 +8,7 @@
     <mat-icon class="fas" [class.fa-expand]="!fullscreenMode" [class.fa-compress]="fullscreenMode" style="height:auto;"></mat-icon>
 </button>
 <button class="collaboraOnlineButton_hide" [class.buttonsHide]="hideButtons" [class.fullScreen]="fullscreenMode" mat-mini-fab color="default"
-        [title]="lang.closeEditor" (click)="hideButtons = !hideButtons">
+        [title]="!hideButtons ? lang.hideTool : lang.showTool" (click)="hideButtons = !hideButtons">
     <mat-icon class="fa fa-arrow-right" style="height:auto;"></mat-icon>
 </button>