diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts
index ab7c183ed..18de7bda0 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts
@@ -128,7 +128,9 @@ export class DmpBlueprintEditorComponent extends BaseEditor<DmpBlueprintEditorMo
 		this.matomoService.trackPageView('Admin: DMP Blueprints');
 		super.ngOnInit();
 		this.initModelFlags(this.route.snapshot.data['action']);
-		this.route.data.subscribe(d => this.initModelFlags(d['action']));
+		this.route.data.subscribe(d => {
+			this.initModelFlags(d['action']);
+		});
 	}
 
 	private initModelFlags(action: string): void {
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
index a8807adfe..a6b6ac261 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
@@ -90,20 +90,20 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button mat-menu-item [routerLink]="[row.id]">
+				<button mat-menu-item [routerLink]="['/dmp-blueprints/', row.id]">
 					<mat-icon>edit</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.EDIT' | translate}}
 				</button>
-				<button mat-menu-item [routerLink]="['new-version' , row.id]">
+				<button mat-menu-item [routerLink]="['/dmp-blueprints/new-version' , row.id]">
 					<mat-icon>queue</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.NEW-VERSION' | translate}}
 				</button>
-				<button mat-menu-item [routerLink]="['clone' , row.id]">
+				<button mat-menu-item [routerLink]="['/dmp-blueprints/clone' , row.id]">
 					<mat-icon>content_copy</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.CLONE' | translate}}
 				</button>
-				<button mat-menu-item [routerLink]="['versions' , row.groupId]">
+				<button mat-menu-item [routerLink]="['/dmp-blueprints/versions' , row.groupId]">
 					<mat-icon>library_books</mat-icon>
 					{{'DMP-BLUEPRINT-LISTING.ACTIONS.VIEW-VERSIONS' | translate}}
 				</button>
-				<button mat-menu-item (click)="export(row.id)" [routerLink]="[row.id]">
+				<button mat-menu-item (click)="export(row.id)" [routerLink]="['/dmp-blueprints/', row.id]">
 					<mat-icon>download</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.DOWNLOAD-XML' | translate}}
 				</button>
 				<button mat-menu-item (click)="delete(row.id)">