diff --git a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts
index b3ae5b60f..2542e31eb 100644
--- a/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/component-mappings/add-edit-component-mapping-dialog/add-edit-component-mapping-dialog.component.ts
@@ -73,19 +73,20 @@ export class AddEditComponentMappingDialogComponent
         }
     }
 
-    fileChanged(file: Blob) {
+    fileChanged(file: File) {
         this.form.get('file').setValue(file);
+        this.form.get('fileName').setValue(file?.name);
     }
 
     save() {
-        const fileName = document.getElementById('file-name-label')?.textContent;
-        this.dialogRef.close({ ...this.data.mapping, ...this.form.getRawValue(), fileName });
+        this.dialogRef.close({ ...this.data.mapping, ...this.form.getRawValue() });
     }
 
     #getForm(): UntypedFormGroup {
         return this._formBuilder.group({
             name: [this.data?.mapping?.name, Validators.required],
             file: [null, Validators.required],
+            fileName: [this.data?.mapping?.fileName, Validators.required],
             encoding: this.encodingTypeOptions.find(e => e === this.data?.mapping?.encoding) ?? this.encodingTypeOptions[0],
             delimiter: [this.data?.mapping?.delimiter ?? ',', Validators.required],
         });
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html
index 94e7dc00a..529fbd011 100644
--- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.html
@@ -33,7 +33,7 @@
                     </mat-checkbox>
 
                     <div class="iqser-input-group datepicker-wrapper">
-                        <ng-container *ngIf="hasValidFrom()">
+                        @if (hasValidFrom()) {
                             <input
                                 (dateChange)="applyValidityIntervalConstraints()"
                                 [matDatepicker]="fromPicker"
@@ -44,7 +44,7 @@
                                 <mat-icon matDatepickerToggleIcon svgIcon="iqser:calendar"></mat-icon>
                             </mat-datepicker-toggle>
                             <mat-datepicker #fromPicker></mat-datepicker>
-                        </ng-container>
+                        }
                     </div>
                 </div>
 
@@ -53,7 +53,7 @@
                         {{ 'add-edit-clone-dossier-template.form.valid-to' | translate }}
                     </mat-checkbox>
                     <div class="iqser-input-group datepicker-wrapper">
-                        <ng-container *ngIf="hasValidTo()">
+                        @if (hasValidTo()) {
                             <input
                                 (dateChange)="applyValidityIntervalConstraints()"
                                 [matDatepicker]="toPicker"
@@ -64,77 +64,79 @@
                                 <mat-icon matDatepickerToggleIcon svgIcon="iqser:calendar"></mat-icon>
                             </mat-datepicker-toggle>
                             <mat-datepicker #toPicker></mat-datepicker>
-                        </ng-container>
+                        }
                     </div>
                 </div>
             </div>
 
-            <div *ngIf="!isDocumine" class="mt-24">
-                <div class="heading">
-                    {{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }}
-                </div>
-                <div class="iqser-input-group">
-                    <mat-checkbox color="primary" formControlName="applyDictionaryUpdatesToAllDossiersByDefault">
-                        {{ 'add-edit-clone-dossier-template.form.apply-updates-default.description' | translate }}
-                    </mat-checkbox>
-                </div>
-            </div>
-
-            <div class="mt-24">
-                <div class="heading mb-14">{{ 'download-includes' | translate }}</div>
-
-                <redaction-select
-                    [label]="
-                        'download-type.label'
-                            | translate
-                                : {
-                                      length: form.controls['downloadFileTypes'].value.length
-                                  }
-                    "
-                    [options]="downloadTypes"
-                    formControlName="downloadFileTypes"
-                ></redaction-select>
-            </div>
-
-            <div *ngIf="!isDocumine" class="mt-24">
-                <div class="heading">
-                    {{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }}
-                </div>
-                <div class="iqser-input-group">
-                    <mat-checkbox color="primary" formControlName="ocrByDefault">
-                        {{ 'add-edit-clone-dossier-template.form.upload-settings.ocr-by-default' | translate }}
-                    </mat-checkbox>
-                </div>
-                <div class="iqser-input-group">
-                    <mat-checkbox color="primary" formControlName="removeWatermark">
-                        {{ 'add-edit-clone-dossier-template.form.upload-settings.remove-watermark' | translate }}
-                    </mat-checkbox>
-                </div>
-            </div>
-
-            <div *ngIf="!isDocumine" class="mt-24 hidden-elements">
-                <div class="heading">{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}</div>
-                <div class="iqser-input-group">
-                    <mat-checkbox color="primary" formControlName="keepHiddenText">
-                        {{ 'add-edit-clone-dossier-template.form.hidden-text.title' | translate }}
-                    </mat-checkbox>
-                    <div class="info">{{ 'add-edit-clone-dossier-template.form.hidden-text.description' | translate }}</div>
-                </div>
-                <div class="iqser-input-group">
-                    <mat-checkbox color="primary" formControlName="keepImageMetadata">
-                        {{ 'add-edit-clone-dossier-template.form.image-metadata.title' | translate }}
-                    </mat-checkbox>
-                    <div class="info">{{ 'add-edit-clone-dossier-template.form.image-metadata.description' | translate }}</div>
-                </div>
-                <div class="iqser-input-group">
-                    <mat-checkbox color="primary" formControlName="keepOverlappingObjects">
-                        {{ 'add-edit-clone-dossier-template.form.overlapping-elements.title' | translate }}
-                    </mat-checkbox>
-                    <div class="info">
-                        {{ 'add-edit-clone-dossier-template.form.overlapping-elements.description' | translate }}
+            @if (!isDocumine) {
+                <div class="mt-24">
+                    <div class="heading">
+                        {{ 'add-edit-clone-dossier-template.form.apply-updates-default.heading' | translate }}
+                    </div>
+                    <div class="iqser-input-group">
+                        <mat-checkbox color="primary" formControlName="applyDictionaryUpdatesToAllDossiersByDefault">
+                            {{ 'add-edit-clone-dossier-template.form.apply-updates-default.description' | translate }}
+                        </mat-checkbox>
                     </div>
                 </div>
-            </div>
+
+                <div class="mt-24">
+                    <div class="heading mb-14">{{ 'download-includes' | translate }}</div>
+
+                    <redaction-select
+                        [label]="
+                            'download-type.label'
+                                | translate
+                                    : {
+                                          length: form.controls['downloadFileTypes'].value.length,
+                                      }
+                        "
+                        [options]="downloadTypes"
+                        formControlName="downloadFileTypes"
+                    ></redaction-select>
+                </div>
+
+                <div class="mt-24">
+                    <div class="heading">
+                        {{ 'add-edit-clone-dossier-template.form.upload-settings.heading' | translate }}
+                    </div>
+                    <div class="iqser-input-group">
+                        <mat-checkbox color="primary" formControlName="ocrByDefault">
+                            {{ 'add-edit-clone-dossier-template.form.upload-settings.ocr-by-default' | translate }}
+                        </mat-checkbox>
+                    </div>
+                    <div class="iqser-input-group">
+                        <mat-checkbox color="primary" formControlName="removeWatermark">
+                            {{ 'add-edit-clone-dossier-template.form.upload-settings.remove-watermark' | translate }}
+                        </mat-checkbox>
+                    </div>
+                </div>
+
+                <div class="mt-24 hidden-elements">
+                    <div class="heading">{{ 'add-edit-clone-dossier-template.form.hidden-text.heading' | translate }}</div>
+                    <div class="iqser-input-group">
+                        <mat-checkbox color="primary" formControlName="keepHiddenText">
+                            {{ 'add-edit-clone-dossier-template.form.hidden-text.title' | translate }}
+                        </mat-checkbox>
+                        <div class="info">{{ 'add-edit-clone-dossier-template.form.hidden-text.description' | translate }}</div>
+                    </div>
+                    <div class="iqser-input-group">
+                        <mat-checkbox color="primary" formControlName="keepImageMetadata">
+                            {{ 'add-edit-clone-dossier-template.form.image-metadata.title' | translate }}
+                        </mat-checkbox>
+                        <div class="info">{{ 'add-edit-clone-dossier-template.form.image-metadata.description' | translate }}</div>
+                    </div>
+                    <div class="iqser-input-group">
+                        <mat-checkbox color="primary" formControlName="keepOverlappingObjects">
+                            {{ 'add-edit-clone-dossier-template.form.overlapping-elements.title' | translate }}
+                        </mat-checkbox>
+                        <div class="info">
+                            {{ 'add-edit-clone-dossier-template.form.overlapping-elements.description' | translate }}
+                        </div>
+                    </div>
+                </div>
+            }
         </div>
 
         <div class="dialog-actions">
diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts
index 0d21402f1..a9b2ffd59 100644
--- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info-screen/dossier-template-info-screen.component.ts
@@ -26,6 +26,7 @@ import { NgIf } from '@angular/common';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatIcon } from '@angular/material/icon';
 import { SelectComponent } from '@shared/components/select/select.component';
+import { MatSuffix } from '@angular/material/form-field';
 
 const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(type => ({
     key: type,
@@ -47,6 +48,7 @@ const downloadTypes = ['ORIGINAL', 'PREVIEW', 'DELTA_PREVIEW', 'REDACTED'].map(t
         SelectComponent,
         IconButtonComponent,
         MatIcon,
+        MatSuffix,
     ],
 })
 export default class DossierTemplateInfoScreenComponent extends BaseFormComponent implements OnInit {
diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json
index 57cc94144..91a25aeb1 100644
--- a/apps/red-ui/src/assets/i18n/redact/de.json
+++ b/apps/red-ui/src/assets/i18n/redact/de.json
@@ -568,6 +568,7 @@
     },
     "search": "Nach Name suchen...",
     "table-col-names": {
+      "column-labels": "Column labels",
       "name": "Name",
       "number-of-lines": "Zeilenzahl",
       "version": "Version"
diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json
index 515f352af..9c1134212 100644
--- a/apps/red-ui/src/assets/i18n/scm/de.json
+++ b/apps/red-ui/src/assets/i18n/scm/de.json
@@ -568,6 +568,7 @@
     },
     "search": "Search by name...",
     "table-col-names": {
+      "column-labels": "Column labels",
       "name": "name",
       "number-of-lines": "Number of lines",
       "version": "version"