diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
index 4ba7c0f73..432771eb9 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.html
@@ -17,7 +17,7 @@
 
 			<mat-form-field class="col-md-3">
 				<app-multiple-auto-complete placeholder="{{'CRITERIA.DMP.LIKE'| translate}}" name="dmpCriteriaName" [(ngModel)]="criteria.dmpIds"
-				 (ngModelChange)="controlModified()" [configuration]="dmpAutoCompleteConfiguration" [disabled]="!dmpSearchEnabled"></app-multiple-auto-complete>
+				 (ngModelChange)="controlModified()" [configuration]="dmpAutoCompleteConfiguration"></app-multiple-auto-complete>
 			</mat-form-field>
 
 			<mat-form-field class="col-md-3">
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
index b4cc74fbd..15cde7352 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
@@ -52,7 +52,8 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 		this.route.params
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(async (params: Params) => {
-				this.dmpId = params['dmpId'];
+				const queryParams = this.route.snapshot.queryParams;
+				this.dmpId = queryParams['dmpId'];
 				this.criteria.setRefreshCallback(() => this.refresh());
 				if (this.dmpId != null) {
 					this.dmpSearchEnabled = false;
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
index cfaaf9e79..b89907732 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
@@ -147,7 +147,6 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 							this.formGroup = this.dmp.buildForm();
 							this.registerFormEventsForDmpProfile(this.dmp.definition);
 							if (!this.editMode || this.dmp.status === Status.Inactive) { this.formGroup.disable(); }
-
 							this.breadCrumbs = Observable.of([
 								{
 									parentComponentName: 'DmpListingComponent',
@@ -186,7 +185,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 			});
 	}
 
-	registerFormEventsForDmpProfile( definitionPropertys?:DmpProfileDefinition): void {
+	registerFormEventsForDmpProfile(definitionPropertys?: DmpProfileDefinition): void {
 		this.formGroup.get('profile').valueChanges
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(Option => {
@@ -200,7 +199,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 				} else {
 					this.selectedDmpProfileDefinition = null;
 				}
-				this.selectedDmpProfileDefinition=definitionPropertys;
+				this.selectedDmpProfileDefinition = definitionPropertys;
 			})
 	}
 
@@ -222,8 +221,6 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 		return this.dmpProfileService.getPaged(request).map(x => x.data);
 	}
 
-
-
 	searchProject(query: string) {
 		const projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem();
 		projectRequestItem.criteria = new ProjectCriteria();
@@ -245,8 +242,8 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 		this.dmpService.createDmp(this.formGroup.getRawValue())
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(
-				complete => this.onCallbackSuccess(),
-				error => this.onCallbackError(error)
+			complete => this.onCallbackSuccess(),
+			error => this.onCallbackError(error)
 			);
 	}
 
@@ -337,8 +334,8 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 				this.dmpService.delete(this.dmp.id)
 					.pipe(takeUntil(this._destroyed))
 					.subscribe(
-						complete => { this.onCallbackSuccess() },
-						error => this.onDeleteCallbackError(error)
+					complete => { this.onCallbackSuccess() },
+					error => this.onDeleteCallbackError(error)
 					);
 			}
 		});
@@ -367,7 +364,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 	}
 
 	redirectToDatasets() {
-		this.router.navigate(['datasets/dmp/' + this.dmp.id]);
+		this.router.navigate(['datasets'], { queryParams: { dmpId: this.dmp.id } });
 	}
 
 	newVersion(id: String, label: String) {
@@ -467,6 +464,4 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
 			}
 		});
 	}
-
-
 }