diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java
index f8818d5c3..d77822317 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java
@@ -185,7 +185,7 @@ public class LockController {
     }
 
     @Transactional
-    @DeleteMapping("target/touch/{id}")
+    @GetMapping("target/touch/{id}")
     public boolean touch(@PathVariable("id") UUID targetId) throws Exception {
         AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.dmpAffiliation(targetId);
         AffiliatedResource affiliatedResourceDescription = this.authorizationContentResolver.descriptionAffiliation(targetId);
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts b/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts
index 3662abe15..3ce850251 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts
@@ -33,7 +33,7 @@ export class DescriptionFormAnnotationService extends BaseService {
 	}
 
 	public getCount(anchor: string) {
-		if (this.annotationsPerAnchor.has(anchor)) {
+		if (this.annotationsPerAnchor?.has(anchor)) {
 			return this.annotationsPerAnchor.get(anchor);
 		} else {
 			return 0;
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
index 81556c080..292d42b67 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
@@ -296,7 +296,7 @@
 												<div class="heading">{{'DMP-EDITOR.FIELDS.DESCRIPTION-TEMPLATES' | translate}}</div>
 												<mat-form-field class="w-100">
 													<mat-label>{{'DMP-EDITOR.FIELDS.DESCRIPTION-TEMPLATES-HINT' | translate}}</mat-label>
-													<app-multiple-auto-complete placeholder="{{'DMP-EDITOR.FIELDS.DESCRIPTION-TEMPLATES-HINT' | translate}}" [hidePlaceholder]="true" required='true' [formControl]="formGroup.get('descriptionTemplates').get(section.id)" [configuration]="descriptionTemplateService.descriptionTempalteGroupMultipleAutocompleteConfiguration" (optionRemoved)="onRemoveDescriptionTemplate($event, i)" (optionActionClicked)="onPreviewDescriptionTemplate($event, i)">
+													<app-multiple-auto-complete placeholder="{{'DMP-EDITOR.FIELDS.DESCRIPTION-TEMPLATES-HINT' | translate}}" [hidePlaceholder]="true" required='true' [formControl]="formGroup.get('descriptionTemplates').get(section.id)" [configuration]="descriptionTemplateService.descriptionTempalteGroupMultipleAutocompleteConfiguration" (optionActionClicked)="onPreviewDescriptionTemplate($event, i)">
 													</app-multiple-auto-complete>
 													<mat-error *ngIf="formGroup.get('descriptionTemplates').get(section.id).hasError('backendError')">{{formGroup.get('descriptionTemplates').get(section.id).getError('backendError').message}}</mat-error>
 													<mat-error *ngIf="formGroup.get('descriptionTemplates').get(section.id).hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
index b3ba32856..8724729c4 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
@@ -451,12 +451,6 @@ export class DmpEditorComponent extends BaseEditor<DmpEditorModel, Dmp> implemen
 	//
 	//
 
-	onRemoveDescriptionTemplate(event, sectionIndex: number) {
-		let found = false;
-		const section = this.selectedBlueprint.definition.sections[sectionIndex];
-		let sectionDescriptionTemplates = (this.formGroup.get('descriptionTemplates') as UntypedFormArray).controls.find(x => x.get('sectionId').value === event.id);
-	}
-
 	onPreviewDescriptionTemplate(event, sectionIndex: number) {
 		// const dialogRef = this.dialog.open(DatasetPreviewDialogComponent, {
 		// 	width: '590px',