diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
index b6fb3c5d4..0074428eb 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
@@ -52,13 +52,12 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 			query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds()));
 		if (criteria.getStatus() != null) {
 			if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) {
-				query.where((builder, root) -> builder.and(builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()), builder.notEqual(root.get("isPublic"), true)));
+				query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()));
 			} else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) {
 				query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue()));
 			}
 		}
-		if (criteria.getIsPublic())
-			query.where(((builder, root) -> builder.equal(root.get("isPublic"), true)));
+		query.where(((builder, root) -> builder.equal(root.get("isPublic"), criteria.getIsPublic())));
         /*if (criteria.getRole() != null) {
             if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())) {
                 query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.OWNER.getValue()));
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index a6c265e08..d3d09086c 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -392,16 +392,22 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 	}
 
 	setPublicCriteria(formGroup?: FormGroup): void {
-		if (formGroup && formGroup.get('status').value == 2) {
-			this.criteria.isPublic = true;
+		if (!isNullOrUndefined(formGroup)) {
+			if (formGroup.get('status').value == 2) {
+				this.criteria.status = 1;
+				this.criteria.isPublic = true;
+			} else {
+				this.criteria.isPublic = false;
+			}
 		}
 
 		this.criteria.onlyPublic = this.isPublic;
 		if (this.isPublic) {
 			this.criteria.isPublic = true;
-		} else {
-			this.criteria.isPublic = false;
 		}
+		// } else {
+		// 	this.criteria.isPublic = false;
+		// }
 	}
 
 	hasScrollbar(): boolean {
@@ -467,17 +473,17 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 
 	public setDashboardTourDmpText(): void {
 		this.dmpText = this.language.instant('DMP-LISTING.TEXT-INFO') + '\n\n' +
-		this.language.instant('DMP-LISTING.TEXT-INFO-QUESTION') + ' ' +
-		this.language.instant('DMP-LISTING.LINK-ZENODO') + ' ' +
-		this.language.instant('DMP-LISTING.GET-IDEA');
+			this.language.instant('DMP-LISTING.TEXT-INFO-QUESTION') + ' ' +
+			this.language.instant('DMP-LISTING.LINK-ZENODO') + ' ' +
+			this.language.instant('DMP-LISTING.GET-IDEA');
 		this.dashboardTour.steps[0].title = this.dmpText;
 	}
 
 	public setDashboardTourDatasetText(): void {
 		this.datasetText = this.language.instant('DATASET-LISTING.TEXT-INFO') +
-		this.language.instant('DATASET-LISTING.LINK-PUBLIC-DATASETS') + ' ' +
-		this.language.instant('DATASET-LISTING.TEXT-INFO-REST') + '\n\n' +
-		this.language.instant('DATASET-LISTING.TEXT-INFO-PAR');
+			this.language.instant('DATASET-LISTING.LINK-PUBLIC-DATASETS') + ' ' +
+			this.language.instant('DATASET-LISTING.TEXT-INFO-REST') + '\n\n' +
+			this.language.instant('DATASET-LISTING.TEXT-INFO-PAR');
 		this.dashboardTour.steps[1].title = this.datasetText;
 	}