diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index e830d50b6..d6e9c7006 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -62,7 +62,7 @@
 							</div>
 						</mat-tab>
 						<mat-tab label="{{'DASHBOARD.DRAFTS' | translate}}">
-							<!-- <app-drafts></app-drafts> -->
+							<app-drafts></app-drafts>
 						</mat-tab>
 						<mat-tab label="{{'DASHBOARD.DMPS' | translate}}">
 							<div class="col-auto pt-3"><input type="text" class="d-flex ml-auto" placeholder="&nbsp;&nbsp;&#xf002;&nbsp;&nbsp;Search"></div>
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
index 88ac33dac..3db57fa5a 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.ts
@@ -8,8 +8,6 @@ import { SearchBarItem } from '@app/core/model/dashboard/search-bar-item';
 import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
 import { DatasetListingModel } from '@app/core/model/dataset/dataset-listing';
 import { DmpListingModel } from '@app/core/model/dmp/dmp-listing';
-import { ExploreDatasetCriteriaModel } from '@app/core/query/explore-dataset/explore-dataset-criteria';
-import { ExploreDmpCriteriaModel } from '@app/core/query/explore-dmp/explore-dmp-criteria';
 import { GrantCriteria } from '@app/core/query/grant/grant-criteria';
 import { RequestItem } from '@app/core/query/request-item';
 import { AuthService } from '@app/core/services/auth/auth.service';
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
index 9026dc3e8..01b51d79d 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.module.ts
@@ -14,16 +14,17 @@ import { RecentVisitedActivityComponent } from '@app/ui/dashboard/recent-visited
 import { WizardComponent } from '@app/ui/dashboard/wizard/wizard.component';
 import { CommonUiModule } from '@common/ui/common-ui.module';
 import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
-import { GuestModule } from '../guest/guest.module';
-import { GuestComponent } from '../guest/guest.component';
 import { RecentEditedDatasetActivityComponent } from './recent-edited-dataset-activity/recent-edited-dataset-activity.component';
+import { DatasetCopyDialogueComponent } from '../dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
+import { DatasetCopyDialogModule } from '../dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module';
 
 @NgModule({
 	imports: [
 		CommonUiModule,
 		DashboardRoutingModule,
 		ExportMethodDialogModule,
-		ConfirmationDialogModule
+		ConfirmationDialogModule,
+		DatasetCopyDialogModule
 	],
 	declarations: [
 		DashboardComponent,
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
index 35e48985f..93a39c637 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
@@ -31,7 +31,7 @@
 				<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 			</div>
 			<mat-menu #actionsMenu="matMenu">
-				<button mat-menu-item (click)="openDmpSearchDialogue()" class="menu-item">
+				<button mat-menu-item (click)="openDmpSearchDialogue(activity.id)" class="menu-item">
 					<mat-icon>file_copy</mat-icon>{{'DATASET-WIZARD.ACTIONS.COPY-DATASET' | translate}}
 				</button>
 				<button mat-menu-item (click)="openConfirm(activity.id)" class="menu-item">
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module.ts
new file mode 100644
index 000000000..8c2094b8f
--- /dev/null
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonUiModule } from '@common/ui/common-ui.module';
+
+import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
+import { CommonFormsModule } from '@common/forms/common-forms.module';
+import { DatasetCopyDialogueComponent } from './dataset-copy-dialogue.component';
+
+@NgModule({
+	imports: [
+		CommonUiModule,
+		CommonFormsModule,
+		AutoCompleteModule
+	],
+	declarations: [
+		DatasetCopyDialogueComponent
+	],
+	entryComponents: [
+		DatasetCopyDialogueComponent
+	]
+})
+export class DatasetCopyDialogModule { }
diff --git a/dmp-frontend/src/app/ui/dataset/dataset.module.ts b/dmp-frontend/src/app/ui/dataset/dataset.module.ts
index 5a7900993..804bb64ae 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset.module.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
 import { ExportMethodDialogModule } from '@app/library/export-method-dialog/export-method-dialog.module';
 import { UrlListingModule } from '@app/library/url-listing/url-listing.module';
-import { DatasetCopyDialogueComponent } from '@app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
 import { DatasetEditorComponent } from '@app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component';
 import { DatasetWizardComponent } from '@app/ui/dataset/dataset-wizard/dataset-wizard.component';
 import { DatasetExternalReferencesEditorComponent } from '@app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component';
@@ -23,6 +22,7 @@ import { FormValidationErrorsDialogModule } from '@common/forms/form-validation-
 import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
 import { CommonUiModule } from '@common/ui/common-ui.module';
 import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
+import { DatasetCopyDialogModule } from './dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.module';
 
 @NgModule({
 	imports: [
@@ -37,7 +37,8 @@ import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
 		TableOfContentsModule,
 		AngularStickyThingsModule,
 		DatasetRoutingModule,
-		FormValidationErrorsDialogModule
+		FormValidationErrorsDialogModule,
+		DatasetCopyDialogModule
 	],
 	declarations: [
 		DatasetListingComponent,
@@ -49,7 +50,6 @@ import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
 		DatasetExternalDatasetDialogEditorComponent,
 		DatasetExternalRegistryDialogEditorComponent,
 		DatasetExternalServiceDialogEditorComponent,
-		DatasetCopyDialogueComponent,
 		DatasetUploadDialogue,
 		DatasetListingItemComponent
 	],
@@ -58,7 +58,6 @@ import { AngularStickyThingsModule } from '@w11k/angular-sticky-things';
 		DatasetExternalDatasetDialogEditorComponent,
 		DatasetExternalRegistryDialogEditorComponent,
 		DatasetExternalServiceDialogEditorComponent,
-		DatasetCopyDialogueComponent,
 		DatasetUploadDialogue
 	]
 })
diff --git a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.html b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.html
index 6449d06f1..526b7d5d0 100644
--- a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.html
+++ b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.html
@@ -20,10 +20,8 @@
 				<mat-datepicker #periodEndPicker></mat-datepicker>
 				<mat-error>{{'GENERAL.VALIDATION.GRANT-START-AFTER-END' | translate}}</mat-error>
 			</mat-form-field>
-
-
 			<mat-form-field class="col-10 filter-category">
-				<mat-select placeholder=" {{ 'CRITERIA.GRANTS.GRANT-STATE-TYPE' | translate}}" [(ngModel)]="criteria.grantStateType" (ngModelChange)="controlModified()">
+				<mat-select placeholder=" {{ 'CRITERIA.GRANTS.GRANT-STATE-TYPE' | translate}}" [(ngModel)]="criteria.grantStateType" (ngModelChange)="controlModified()" required>
 					<mat-option [value]="null">
 						{{ 'CRITERIA.GRANTS.TYPES.NONE' | translate}}
 					</mat-option>