diff --git a/dmp-frontend/src/app/core/common/enum/role.ts b/dmp-frontend/src/app/core/common/enum/role.ts
new file mode 100644
index 000000000..a11abaf81
--- /dev/null
+++ b/dmp-frontend/src/app/core/common/enum/role.ts
@@ -0,0 +1,4 @@
+export enum Role {
+	Owner = 0,
+	Member = 1
+}
diff --git a/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts b/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts
index 65d03f029..7c10b2bf0 100644
--- a/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts
+++ b/dmp-frontend/src/app/core/query/explore-dataset/explore-dataset-criteria.ts
@@ -1,8 +1,10 @@
 import { GrantStateType } from "../../common/enum/grant-state-type";
 import { BaseCriteria } from "../base-criteria";
+import { Role } from '../../common/enum/role';
 
 export class ExploreDatasetCriteriaModel extends BaseCriteria {
 	public grantStatus: GrantStateType;
+	public role: Role;
 	public dmpIds: string[] = [];
 	public grants: string[] = [];
 	public datasetProfile: string[] = [];
diff --git a/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts b/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts
index cfd2ea409..e577c31aa 100644
--- a/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts
+++ b/dmp-frontend/src/app/core/query/explore-dmp/explore-dmp-criteria.ts
@@ -1,8 +1,10 @@
 import { BaseCriteria } from "../base-criteria";
 import { GrantStateType } from "../../common/enum/grant-state-type";
+import { Role } from '../../common/enum/role';
 
 export class ExploreDmpCriteriaModel extends BaseCriteria {
 	public grantStatus: GrantStateType;
+	public role: Role;
 	public grants: string[] = [];
 	public datasetProfile: string[] = [];
 	public dmpOrganisations: string[] = [];
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 51bdd3dfb..878a4b1d6 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
@@ -16,9 +16,9 @@
 			<div class="col-10 gray-container" >
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.STATUS'| translate}}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
+					<mat-list-item><mat-radio-button checked value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="0" [checked]="status == 0">{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-STATUS.FINALISED' | translate }}</mat-radio-button></mat-list-item>
-					<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DATASET-STATUS.ANY' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>
 			</div>
 			<!-- End of Status Filter-->
@@ -79,15 +79,9 @@
 			<div class="col-10 gray-container">
 				<h6 class="category-title">{{'CRITERIA.DATA-SETS.ROLE' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('role')">
-					<mat-list-item>
-						<mat-radio-button value="null">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button>
-					</mat-list-item>
-					<mat-list-item>
-						<mat-radio-button value="0">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button>
-					</mat-list-item>
-					<mat-list-item>
-						<mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button>
-					</mat-list-item>
+					<mat-list-item><mat-radio-button checked value="null">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>
 			</div>
 			<!-- End of Role Filter -->
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
index 6c2320f51..f0f777463 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
@@ -16,7 +16,7 @@
 			<div *ngIf="showGrant" class="col-10 gray-container">
 				<h6 class="category-title">{{ 'TYPES.DMP-VISIBILITY.VISIBILITY' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('status')">
-					<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DMP-VISIBILITY.ANY' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="null" checked>{{ 'TYPES.DMP-VISIBILITY.ANY' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="2">{{ 'TYPES.DMP-VISIBILITY.PUBLIC' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DMP-VISIBILITY.FINALIZED' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DMP-VISIBILITY.DRAFT' | translate }}</mat-radio-button></mat-list-item>
@@ -67,7 +67,7 @@
 			<div *ngIf="showGrant" class="col-10 gray-container">
 				<h6 class="category-title">{{ 'DATASET-PROFILE-LISTING.COLUMNS.ROLE' | translate }}</h6>
 				<mat-radio-group aria-label="Select an option" [formControl]="formGroup.get('role')">
-					<mat-list-item><mat-radio-button value="null">{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="null" checked>{{ 'TYPES.DATASET-ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="0">{{ 'TYPES.DATASET-ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
 					<mat-list-item><mat-radio-button value="1">{{ 'TYPES.DATASET-ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
 				</mat-radio-group>
diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html
index 46331edea..e0271734d 100644
--- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html
+++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html
@@ -11,15 +11,11 @@
 
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}</h6>
-			<mat-list-item>
-				<mat-radio-button value="null" checked (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button>
-			</mat-list-item>
-			<mat-list-item>
-				<mat-radio-button value="0" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button>
-			</mat-list-item>
-			<mat-list-item>
-				<mat-radio-button value="1" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button>
-			</mat-list-item>
+			<mat-radio-group>
+				<mat-list-item><mat-radio-button value="null" checked (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button></mat-list-item>
+				<mat-list-item><mat-radio-button value="0" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button></mat-list-item>
+				<mat-list-item><mat-radio-button value="1" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button></mat-list-item>
+			</mat-radio-group>
 		</div>
 
 		<div class="col-10 gray-container">
@@ -49,6 +45,15 @@
 			</mat-form-field>
 		</div>
 
+		<div class="col-10 gray-container">
+			<h6 class="category-title">{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}</h6>
+			<mat-radio-group>
+				<mat-list-item><mat-radio-button value="null" checked (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
+				<mat-list-item><mat-radio-button value="0" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
+				<mat-list-item><mat-radio-button value="1" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
+			</mat-radio-group>
+		</div>
+
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}</h6>
 			<mat-form-field>
diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts
index 210461e33..f63f62551 100644
--- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts
+++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts
@@ -200,6 +200,14 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI
 		return this.organisationService.searchPublicOrganisations(dataTableRequest).pipe(map(x => x.data));
 	}
 
+	public roleChanged(event: any) {
+		this.facetCriteria.role = event.value;
+		if (event.value === 'null') {
+			this.facetCriteria.role = null;
+		}
+		this.facetCriteriaChange.emit(this.facetCriteria);
+	}
+
 	public dmpOrganisationChanged(event: any) {
 		const eventValue = event.option.value.id;
 		if (event.option.selected) { this.facetCriteria.dmpOrganisations.push(eventValue); }
diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html
index c32321aa8..f3683b5a6 100644
--- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html
+++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.html
@@ -10,9 +10,11 @@
 
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.GRANT-STATUS.TITLE' | translate }}</h6>
-			<mat-list-item><mat-radio-button value="null" checked (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button></mat-list-item>
-			<mat-list-item><mat-radio-button value="0" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button></mat-list-item>
-			<mat-list-item><mat-radio-button value="1" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button></mat-list-item>
+			<mat-radio-group>
+				<mat-list-item><mat-radio-button value="null" checked (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ANY' | translate }}</mat-radio-button></mat-list-item>
+				<mat-list-item><mat-radio-button value="0" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.ACTIVE' | translate }}</mat-radio-button></mat-list-item>
+				<mat-list-item><mat-radio-button value="1" (change)="grantStatusChanged($event)">{{ 'FACET-SEARCH.GRANT-STATUS.OPTIONS.INACTIVE' | translate }}</mat-radio-button></mat-list-item>
+			</mat-radio-group>
 		</div>
 
 		<div class="col-10 gray-container">
@@ -37,6 +39,15 @@
 			</mat-form-field>
 		</div>
 
+		<div class="col-10 gray-container">
+				<h6 class="category-title">{{ 'FACET-SEARCH.ROLE.TITLE' | translate }}</h6>
+				<mat-radio-group>
+					<mat-list-item><mat-radio-button value="null" checked (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.ANY' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="0" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.OWNER' | translate }}</mat-radio-button></mat-list-item>
+					<mat-list-item><mat-radio-button value="1" (change)="roleChanged($event)">{{ 'FACET-SEARCH.ROLE.MEMBER' | translate }}</mat-radio-button></mat-list-item>
+				</mat-radio-group>
+			</div>
+
 		<div class="col-10 gray-container">
 			<h6 class="category-title">{{ 'FACET-SEARCH.DMP-ORGANISATIONS.TITLE' | translate }}</h6>
 			<mat-form-field>
diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts
index 791beda34..051b78c45 100644
--- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts
+++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.ts
@@ -254,6 +254,14 @@ export class ExploreDmpFiltersComponent extends BaseCriteriaComponent implements
 		}
 	}
 
+	public roleChanged(event: any) {
+		this.facetCriteria.role = event.value;
+		if (event.value === 'null') {
+			this.facetCriteria.role = null;
+		}
+		this.facetCriteriaChange.emit(this.facetCriteria);
+	}
+
 	dmpOrganisationChanged(event: any) {
 		const eventValue = event.option.value.id;
 		if (event.option.selected) { this.facetCriteria.dmpOrganisations.push(eventValue); }
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html
index 01e80388f..b39bd663d 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html
@@ -108,10 +108,8 @@
 
 	<div *ngSwitchCase="datasetProfileFieldViewStyleEnum.BooleanDecision" class="col-12">
 		<mat-radio-group [formControl]="form.get('value')" [required]="form.get('validationRequired').value">
-			<mat-radio-button class="radio-button-item" name="{{form.get('id').value}}" value="true">Yes
-			</mat-radio-button>
-			<mat-radio-button class="radio-button-item" name="{{form.get('id').value}}" value="false">No
-			</mat-radio-button>
+			<mat-radio-button class="radio-button-item" name="{{form.get('id').value}}" value="true">{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.ACTIONS.YES" | translate }}</mat-radio-button>
+			<mat-radio-button class="radio-button-item" name="{{form.get('id').value}}" value="false">{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.ACTIONS.NO" | translate }}</mat-radio-button>
 		</mat-radio-group>
 		<mat-error *ngIf="form.get('value').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}
 		</mat-error>
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 4d4921c73..0c3ee1c97 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -852,7 +852,11 @@
 		"DATASET-PROFILE-COMBO-BOX-TYPE": {
 			"WORD-LIST": "Word List",
 			"AUTOCOMPLETE": "Autocomplete",
-			"EXTERNAL-SOURCE-HINT": "External source"
+			"EXTERNAL-SOURCE-HINT": "External source",
+			"ACTIONS": {
+				"YES": "Yes",
+				"No": "No"
+			}
 		},
 		"DATASET-PROFILE-INTERNAL-DMP-ENTITIES-TYPE": {
 			"RESEARCHERS": "Researchers",
@@ -1022,14 +1026,20 @@
 			}
 		},
 		"GRANT": {
-			"TITLE": "Grant",
+			"TITLE": "Related Grant",
 			"FILTER": "Filter Grants"
 		},
 		"PROFILES": {
 			"TITLE": "Dataset specification"
 		},
+		"ROLE": {
+			"TITLE": "Role",
+			"ANY": "Any",
+			"OWNER": "Owner",
+			"MEMBER": "Member"
+		},
 		"DMP-ORGANISATIONS": {
-			"TITLE": "DMP Organizations",
+			"TITLE": "Organization",
 			"FILTER": "Filter Organizations"
 		}
 	},