diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts
index a632a6cb7..0d2ea6119 100644
--- a/dmp-frontend/src/app/app-routing.module.ts
+++ b/dmp-frontend/src/app/app-routing.module.ts
@@ -15,7 +15,7 @@ import { ProjectDetailedComponent } from './viewers/project-detailed/project-det
 
 const appRoutes: Routes = [
   
-  { path: 'dynamic-form', component: DynamicFormComponent, canActivate: [AuthGuard] },
+  { path: 'dynamic-form/:id', component: DynamicFormComponent, canActivate: [AuthGuard] },
   { path: 'dataset', component: DatasetsComponent },
   { path: 'login', component: MainSignInComponent},
   { path: 'projects', component: ProjectsComponent},
diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts
index 69aa4a209..21273a751 100644
--- a/dmp-frontend/src/app/datasets/dataset.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset.component.ts
@@ -240,7 +240,7 @@ export class DatasetsComponent implements OnInit {
   }
 
   describeDataset(item) {
-    this.router.navigate(['/dynamic-form'], { queryParams: {id: item.profile.id, datasetId:item.id, label: item.label}});
+    this.router.navigate(['/dynamic-form/'+item.id]);
     //this.ngZone.run(() => this.router.navigate(['dynamic-form', {id: item.profile.id, datasetId:item.id, label: item.label}]));
   }
 
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 77460d458..01ebc4f3e 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -67,7 +67,8 @@ export class DynamicFormComponent implements OnInit {
 
   constructor(private qcs: FieldControlService, private serverService: ServerService, private router: Router, private pdfService: PDFService,
     private _location: Location, private route: ActivatedRoute, private pagerService: PaginationService, private tokenService: TokenService, private visibilityRulesService: VisibilityRulesService) {
-  }
+      this.datasetId = route.snapshot.params['id'];
+    }
 
   getSubForm(subformName) {
     return this.form.controls[subformName];
@@ -75,12 +76,9 @@ export class DynamicFormComponent implements OnInit {
 
 
   ngOnInit() {
-    //this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(new DatasetModel(), DatasetModel);
-    //this.form = this.dataModel.buildForm();
+
     let sub = this.route.queryParams.subscribe(params => {
 
-      let dmpid = params.id;
-      this.datasetId = params.datasetId;
       this.serverService.getDmp(this.datasetId).subscribe(
         response => {
           this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(response, DatasetModel);
diff --git a/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts b/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts
index e7802e191..a4304868a 100644
--- a/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts
+++ b/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts
@@ -4,6 +4,6 @@ export class BaseTableOfContent{
     constructor(public router: Router,public route:ActivatedRoute){}
     
     scrollToId(elementId) {
-      this.router.navigate([this.route.snapshot.url], { fragment: elementId });    
+      this.router.navigate([this.route.snapshot.url[0]+"/"+this.route.snapshot.url[1]], { fragment: elementId });    
     } 
 }
\ No newline at end of file