diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java
index ad959b6bb..a77d85be2 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java
@@ -6,8 +6,10 @@ import eu.eudat.data.query.definition.TableQuery;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
+import eu.eudat.types.project.ProjectStateType;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.UUID;
 
 /**
@@ -26,8 +28,14 @@ public class DatasetPublicTableRequest extends TableQuery<DatasetPublicCriteria,
                     builder.like(builder.upper(root.get("description")), "%" + this.getCriteria().getLike().toUpperCase() + "%")));
         if (this.getCriteria().projects != null && !this.getCriteria().projects.isEmpty())
             query.where(((builder, root) -> root.get("dmp").get("project").get("id").in(this.getCriteria().projects)));
-        if (this.getCriteria().projectStatus != null) query
-                .where(((builder, root) -> builder.equal(root.get("dmp").get("project").get("status"), this.getCriteria().projectStatus.getValue())));
+        if (this.getCriteria().projectStatus != null) {
+            if (this.getCriteria().projectStatus.getValue().equals(ProjectStateType.FINISHED.getValue()))
+                query.where((builder, root) -> builder.lessThan(root.get("dmp").get("project").get("enddate"), new Date()));
+            if (this.getCriteria().projectStatus.getValue().equals(ProjectStateType.ONGOING.getValue()))
+                query.where((builder, root) ->
+                        builder.or(builder.greaterThan(root.get("dmp").get("project").get("enddate"), new Date())
+                                , builder.isNull(root.get("dmp").get("project").get("enddate"))));
+        }
         if (this.getCriteria().datasetProfile != null && !this.getCriteria().datasetProfile.isEmpty()) query
                 .where(((builder, root) -> root.get("profile").get("id").in(this.getCriteria().datasetProfile)));
         if (this.getCriteria().dmpOrganisations != null && !this.getCriteria().dmpOrganisations.isEmpty()) query
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
index 93ec8c0ef..4c063f97f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 public class DatasetListingModel implements DataModel<Dataset, DatasetListingModel> {
     private String id;
     private String label;
+    private String project;
     private String dmp;
     private String profile;
     private String dataRepositories;
@@ -38,6 +39,14 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.label = label;
     }
 
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
+
     public String getDmp() {
         return dmp;
     }
@@ -107,6 +116,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.id = entity.getId().toString();
         this.label = entity.getLabel();
         this.created = entity.getCreated();
+        this.project = entity.getDmp().getProject().getLabel();
         this.dmp = entity.getDmp() != null ? entity.getDmp().getLabel() : "";
         this.profile = entity.getProfile() != null ? entity.getProfile().getLabel() : "";
         this.description = entity.getDescription();
diff --git a/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.html b/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.html
index 4ce458ce2..1167c3803 100644
--- a/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.html
@@ -22,10 +22,10 @@
             </ng-container>
 
             <!-- Column Definition: Dmp -->
-            <ng-container cdkColumnDef="dmp">
-              <mat-header-cell *matHeaderCellDef mat-sort-header="|join|dmp:label">{{'DATASET-LISTING.COLUMNS.DMP' |
+            <ng-container cdkColumnDef="project">
+              <mat-header-cell *matHeaderCellDef>{{'DATASET-LISTING.COLUMNS.PROJECT' |
                 translate}}</mat-header-cell>
-              <mat-cell *matCellDef="let row"> {{row.dmp}} </mat-cell>
+              <mat-cell *matCellDef="let row"> {{row.project}} </mat-cell>
             </ng-container>
 
             <!-- Column Definition: Profile -->
diff --git a/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.ts b/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.ts
index f5d023ca3..692db13c7 100644
--- a/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset-public/dataset-public-listing.component.ts
@@ -27,7 +27,7 @@ export class DatasetPublicListingComponent implements OnInit {
 	@ViewChild(DatasetCriteriaComponent) criteria: DatasetCriteriaComponent;
 
 	dataSource: DatasetDataSource | null;
-	displayedColumns: String[] = ['label', 'dmp', 'profile', 'status', 'description', 'created'];
+	displayedColumns: String[] = ['label', 'project', 'profile', 'status', 'description', 'created'];
 	pageEvent: PageEvent;
 	titlePrefix: String;
 	dmpId: string;
diff --git a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html
index ae8859978..c45fe01c4 100644
--- a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.html
@@ -1,235 +1,238 @@
 <div class="dataset-wizard">
-  <h3 *ngIf="isNew">{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}</h3>
-  <div class="flex-container">
-    <div fxLayout="row">
-      <h3 *ngIf="!isNew">{{datasetWizardModel?.label}} {{ 'GENERAL.NAMES.DATASET' | translate }}</h3>
-      <h3 *ngIf="this.formGroup && this.formGroup.dirty"> - {{ 'GENERAL.STATUSES.EDIT' | translate }}</h3>
-      <h3 *ngIf="this.formGroup && viewOnly"> - {{ 'GENERAL.STATUSES.FINALISED' | translate }}</h3>
-    </div>
-  </div>
-  <div class="flex-container" *ngIf="this.datasetProfileDefinitionModel">
-    <button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
-      (click)="save();" type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}</button>
-
-    <button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
-      (click)="saveFinalize();" type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}</button>
-    <button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status == 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
-      (click)="downloadPDF();" type="button">{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-PDF' | translate }}</button>
-    <button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status == 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
-      (click)="downloadXML();" type="button">{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-XML' | translate }}</button>
-    <div class="fill-space"></div>
-    <!-- <button mat-button (click)="redirectToProject()">
+	<h3 *ngIf="isNew">{{ 'DATASET-WIZARD.TITLE.NEW' | translate }}</h3>
+	<div class="flex-container">
+		<div fxLayout="row">
+			<h3 *ngIf="!isNew">{{datasetWizardModel?.label}} {{ 'GENERAL.NAMES.DATASET' | translate }}</h3>
+			<h3 *ngIf="this.formGroup && this.formGroup.dirty"> - {{ 'GENERAL.STATUSES.EDIT' | translate }}</h3>
+			<h3 *ngIf="this.formGroup && viewOnly"> - {{ 'GENERAL.STATUSES.FINALISED' | translate }}</h3>
+		</div>
+	</div>
+	<div class="flex-container" *ngIf="this.datasetProfileDefinitionModel">
+		<button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
+		 (click)="save();" type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}</button>
+		<button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status != 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
+		 (click)="saveFinalize();" type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}</button>
+		<button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status == 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
+		 (click)="downloadPDF();" type="button">{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-PDF' | translate }}</button>
+		<button mat-raised-button color="primary" *ngIf="datasetWizardModel&&datasetWizardModel?.status == 1" style="margin-top: 15px;margin-bottom: 15px;margin-right: 15px;"
+		 (click)="downloadXML();" type="button">{{ 'DATASET-WIZARD.ACTIONS.DOWNLOAD-XML' | translate }}</button>
+		<div class="fill-space"></div>
+		<!-- <button mat-button (click)="redirectToProject()">
       <mat-icon>arrow_right_alt</mat-icon>{{'DATASET-WIZARD.ACTIONS.GO-TO-PROJECT' | translate}}</button>
     <button mat-button (click)="redirectToDmp()">
       <mat-icon>arrow_right_alt</mat-icon>{{'DATASET-WIZARD.ACTIONS.GO-TO-DMP' | translate}}</button> -->
 
-  </div>
-  <mat-horizontal-stepper [linear]="isLinear" #stepper>
-    <mat-step [stepControl]="formGroup">
-      <form *ngIf="formGroup" [formGroup]="formGroup">
-        <app-single-auto-complete [required]="true" [reactiveFormControl]="formGroup.get('dmp')" placeholder="{{'DATASET-EDITOR.FIELDS.DMP' | translate}}"
-          [configuration]="dmpAutoCompleteConfiguration">
-        </app-single-auto-complete>
-        <ng-template matStepLabel>{{'DATASET-WIZARD.FIRST-STEP.TITLE' | translate}}</ng-template>
-        <mat-form-field formGroupName="profile">
-          <mat-select placeholder=" {{'DATASET-WIZARD.FIRST-STEP.PROFILE'| translate}}" [required]="true" formControlName="id">
-            <mat-option *ngFor="let profile of availableProfiles" [value]="profile.id">
-              {{profile.label}}
-            </mat-option>
-          </mat-select>
-          <mat-error *ngIf="baseErrorModel?.status">{{baseErrorModel['Criteria.status']}}</mat-error>
-        </mat-form-field>
-        <app-dataset-editor-component [formGroup]="formGroup"></app-dataset-editor-component>
-        <div class="navigation-buttons-container">
-          <button matStepperNext mat-raised-button style="float:right;" color="primary">{{'DATASET-WIZARD.ACTIONS.NEXT' |
-            translate}}
-          </button>
-        </div>
-      </form>
-    </mat-step>
-    <mat-step [stepControl]="formGroup">
-      <form *ngIf="formGroup" [formGroup]="formGroup">
-        <ng-template matStepLabel>{{'DATASET-WIZARD.SECOND-STEP.TITLE' | translate}}</ng-template>
+	</div>
+	<mat-horizontal-stepper [linear]="isLinear" #stepper>
+		<mat-step [stepControl]="formGroup">
+			<form *ngIf="formGroup" [formGroup]="formGroup">
+				<app-single-auto-complete [required]="true" [reactiveFormControl]="formGroup.get('dmp')" placeholder="{{'DATASET-EDITOR.FIELDS.DMP' | translate}}"
+				 [configuration]="dmpAutoCompleteConfiguration">
+				</app-single-auto-complete>
+				<ng-template matStepLabel>{{'DATASET-WIZARD.FIRST-STEP.TITLE' | translate}}</ng-template>
+				<mat-form-field formGroupName="profile">
+					<mat-select placeholder=" {{'DATASET-WIZARD.FIRST-STEP.PROFILE'| translate}}" [required]="true" formControlName="id">
+						<mat-option *ngFor="let profile of availableProfiles" [value]="profile.id">
+							{{profile.label}}
+						</mat-option>
+					</mat-select>
+					<mat-error *ngIf="baseErrorModel?.status">{{baseErrorModel['Criteria.status']}}</mat-error>
+				</mat-form-field>
+				<app-dataset-editor-component [formGroup]="formGroup"></app-dataset-editor-component>
+				<div class="navigation-buttons-container">
+					<button matStepperNext mat-raised-button style="float:right;" color="primary">{{'DATASET-WIZARD.ACTIONS.NEXT' |
+						translate}}
+					</button>
+				</div>
+			</form>
+		</mat-step>
+		<mat-step [stepControl]="formGroup">
+			<form *ngIf="formGroup" [formGroup]="formGroup">
+				<ng-template matStepLabel>{{'DATASET-WIZARD.SECOND-STEP.TITLE' | translate}}</ng-template>
 
-        <mat-card>
-          <mat-card-header>
-            <mat-card-title class="thick" *ngIf='!viewOnly'>
-              {{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES' | translate}}
-              <button mat-raised-button color="primary" (click)="addDataRepository()">
-                {{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
-              </button>
-            </mat-card-title>
-          </mat-card-header>
-          <app-external-item-listing *ngIf="formGroup.get('dataRepositories') && dataRepositoriesTemplate && externalSourcesConfiguration"
-            [options]="externalSourcesConfiguration.dataRepositories" placeholder="{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES' | translate}}"
-            [parentTemplate]='dataRepositoriesTemplate' [displayFunction]='dataRepositoryDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
-            [formGroup]="formGroup.get('dataRepositories')" [viewOnly]='viewOnly' [autoCompleteConfiguration]="dataRepositoriesAutoCompleteConfiguration"
-            (onItemChange)="dataRepositoriesOnItemChange($event)">
-          </app-external-item-listing>
+				<mat-card>
+					<mat-card-header>
+						<mat-card-title class="thick" *ngIf='!viewOnly'>
+							{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES' | translate}}
+							<button mat-raised-button color="primary" (click)="addDataRepository()">
+								{{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
+							</button>
+						</mat-card-title>
+					</mat-card-header>
+					<app-external-item-listing *ngIf="formGroup.get('dataRepositories') && dataRepositoriesTemplate && externalSourcesConfiguration"
+					 [options]="externalSourcesConfiguration.dataRepositories" placeholder="{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES' | translate}}"
+					 [parentTemplate]='dataRepositoriesTemplate' [displayFunction]='dataRepositoryDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
+					 [formGroup]="formGroup.get('dataRepositories')" [viewOnly]='viewOnly' [autoCompleteConfiguration]="dataRepositoriesAutoCompleteConfiguration"
+					 (onItemChange)="dataRepositoriesOnItemChange($event)">
+					</app-external-item-listing>
 
-          <ng-template #dataRepositoriesTemplate let-suggestion let-i="index" let-callback="function">
-            <div class="col-md-2">
-              <p>
-                {{i+1}}) {{suggestion.get('label').value}}
-              </p>
-            </div>
-            <div class="col-md-8">
-              <mat-form-field>
-                <input matInput placeholder="{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES-INFO' | translate}}" type="text" name="info" [formControl]="suggestion.get('info')">
-              </mat-form-field>
-            </div>
-            <div class="col-md-2">
-              <button mat-button (click)="callback(i)">
-                <mat-icon>close</mat-icon>
-              </button>
-            </div>
-          </ng-template>
-        </mat-card>
-        <mat-card>
-          <mat-card-header>
-            <mat-card-title class="thick" *ngIf='!viewOnly'>
-              {{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS' | translate}}
-              <button mat-raised-button color="primary" (click)="addExternalDataset()">
-                {{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
-              </button>
-            </mat-card-title>
-          </mat-card-header>
-          <app-external-item-listing *ngIf="formGroup.get('externalDatasets') && externalDatasetsTemplate && externalSourcesConfiguration"
-            [options]="externalSourcesConfiguration.externalDatasets" placeholder="{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS' | translate}}"
-            [parentTemplate]='externalDatasetsTemplate' [displayFunction]='externalDatasetDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
-            [formGroup]="formGroup.get('externalDatasets')" [viewOnly]='viewOnly' [autoCompleteConfiguration]="externalDatasetAutoCompleteConfiguration"
-            (onItemChange)="externalDatasetsOnItemChange($event)">
-          </app-external-item-listing>
+					<ng-template #dataRepositoriesTemplate let-suggestion let-i="index" let-callback="function">
+						<div class="col-md-2">
+							<p>
+								{{i+1}}) {{suggestion.get('label').value}}
+							</p>
+						</div>
+						<div class="col-md-8">
+							<mat-form-field>
+								<input matInput placeholder="{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES-INFO' | translate}}" type="text" name="info"
+								 [formControl]="suggestion.get('info')">
+							</mat-form-field>
+						</div>
+						<div class="col-md-2">
+							<button mat-button (click)="callback(i)">
+								<mat-icon>close</mat-icon>
+							</button>
+						</div>
+					</ng-template>
+				</mat-card>
+				<mat-card>
+					<mat-card-header>
+						<mat-card-title class="thick" *ngIf='!viewOnly'>
+							{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS' | translate}}
+							<button mat-raised-button color="primary" (click)="addExternalDataset()">
+								{{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
+							</button>
+						</mat-card-title>
+					</mat-card-header>
+					<app-external-item-listing *ngIf="formGroup.get('externalDatasets') && externalDatasetsTemplate && externalSourcesConfiguration"
+					 [options]="externalSourcesConfiguration.externalDatasets" placeholder="{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS' | translate}}"
+					 [parentTemplate]='externalDatasetsTemplate' [displayFunction]='externalDatasetDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
+					 [formGroup]="formGroup.get('externalDatasets')" [viewOnly]='viewOnly' [autoCompleteConfiguration]="externalDatasetAutoCompleteConfiguration"
+					 (onItemChange)="externalDatasetsOnItemChange($event)">
+					</app-external-item-listing>
 
-          <ng-template #externalDatasetsTemplate let-suggestion let-i="index" let-callback="function">
-            <div class="col-md-2">
-              <p>
-                {{i+1}}) {{suggestion.get('label').value}}
-              </p>
-            </div>
-            <div class="col-md-4">
-              <mat-form-field>
-                <input matInput placeholder="{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASET-INFO' | translate}}" type="text" name="info" [formControl]="suggestion.get('info')">
-              </mat-form-field>
-            </div>
+					<ng-template #externalDatasetsTemplate let-suggestion let-i="index" let-callback="function">
+						<div class="col-md-2">
+							<p>
+								{{i+1}}) {{suggestion.get('label').value}}
+							</p>
+						</div>
+						<div class="col-md-4">
+							<mat-form-field>
+								<input matInput placeholder="{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASET-INFO' | translate}}" type="text" name="info"
+								 [formControl]="suggestion.get('info')">
+							</mat-form-field>
+						</div>
 
-            <div class="col-md-4">
-              <mat-form-field>
-                <mat-select placeholder="{{'DATASET-WIZARD.EDITOR.FIELDS.EXTERNAL-DATASET-TYPE' | translate}}" [formControl]="suggestion.get('type')">
-                  <mat-option [value]="0">{{'TYPES.EXTERNAL-DATASET-TYPE.SOURCE' | translate}}</mat-option>
-                  <mat-option [value]="1">{{'TYPES.EXTERNAL-DATASET-TYPE.OUTPUT' | translate}}</mat-option>
-                </mat-select>
-              </mat-form-field>
-            </div>
-            <div class="col-md-2">
-              <button mat-button (click)="callback(i)">
-                <mat-icon>close</mat-icon>
-              </button>
-            </div>
-          </ng-template>
-        </mat-card>
+						<div class="col-md-4">
+							<mat-form-field>
+								<mat-select placeholder="{{'DATASET-WIZARD.EDITOR.FIELDS.EXTERNAL-DATASET-TYPE' | translate}}" [formControl]="suggestion.get('type')">
+									<mat-option [value]="0">{{'TYPES.EXTERNAL-DATASET-TYPE.SOURCE' | translate}}</mat-option>
+									<mat-option [value]="1">{{'TYPES.EXTERNAL-DATASET-TYPE.OUTPUT' | translate}}</mat-option>
+								</mat-select>
+							</mat-form-field>
+						</div>
+						<div class="col-md-2">
+							<button mat-button (click)="callback(i)">
+								<mat-icon>close</mat-icon>
+							</button>
+						</div>
+					</ng-template>
+				</mat-card>
 
-        <mat-card>
-          <mat-card-header>
-            <mat-card-title class="thick" *ngIf='!viewOnly'>
-              {{'DATASET-EDITOR.FIELDS.REGISTRIES' | translate}}
-              <button mat-raised-button color="primary" (click)="addRegistry()">
-                {{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
-              </button>
-            </mat-card-title>
-          </mat-card-header>
-          <app-external-item-listing *ngIf="formGroup.get('registries') && registriesTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.registries"
-            placeholder="{{'DATASET-EDITOR.FIELDS.REGISTRIES' | translate}}" [parentTemplate]='registriesTemplate' [displayFunction]='registriesDisplayFunc'
-            [formGroup]="formGroup.get('registries')" [viewOnly]='viewOnly' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
-            [autoCompleteConfiguration]="registriesAutoCompleteConfiguration" (onItemChange)="registriesOnItemChange($event)">
-          </app-external-item-listing>
+				<mat-card>
+					<mat-card-header>
+						<mat-card-title class="thick" *ngIf='!viewOnly'>
+							{{'DATASET-EDITOR.FIELDS.REGISTRIES' | translate}}
+							<button mat-raised-button color="primary" (click)="addRegistry()">
+								{{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
+							</button>
+						</mat-card-title>
+					</mat-card-header>
+					<app-external-item-listing *ngIf="formGroup.get('registries') && registriesTemplate && externalSourcesConfiguration"
+					 [options]="externalSourcesConfiguration.registries" placeholder="{{'DATASET-EDITOR.FIELDS.REGISTRIES' | translate}}"
+					 [parentTemplate]='registriesTemplate' [displayFunction]='registriesDisplayFunc' [formGroup]="formGroup.get('registries')"
+					 [viewOnly]='viewOnly' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc' [autoCompleteConfiguration]="registriesAutoCompleteConfiguration"
+					 (onItemChange)="registriesOnItemChange($event)">
+					</app-external-item-listing>
 
-          <ng-template #registriesTemplate let-suggestion let-i="index" let-callback="function">
-            <div class="col-md-2">
-              <p>
-                {{i+1}}) {{suggestion.get('label').value}}
-              </p>
-            </div>
-            <div class="col-md-10">
-              <button mat-button (click)="callback(i)">
-                <mat-icon>close</mat-icon>
-              </button>
-            </div>
-          </ng-template>
-        </mat-card>
+					<ng-template #registriesTemplate let-suggestion let-i="index" let-callback="function">
+						<div class="col-md-2">
+							<p>
+								{{i+1}}) {{suggestion.get('label').value}}
+							</p>
+						</div>
+						<div class="col-md-10">
+							<button mat-button (click)="callback(i)">
+								<mat-icon>close</mat-icon>
+							</button>
+						</div>
+					</ng-template>
+				</mat-card>
 
-        <mat-card>
-          <mat-card-header>
-            <mat-card-title class="thick" *ngIf='!viewOnly'>
-              {{'DATASET-EDITOR.FIELDS.SERVICES' | translate}}
-              <button mat-raised-button color="primary" (click)="addService()">
-                {{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
-              </button>
-            </mat-card-title>
-          </mat-card-header>
-          <app-external-item-listing *ngIf="formGroup.get('services') && servicesTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.services"
-            placeholder="{{'DATASET-EDITOR.FIELDS.SERVICES' | translate}}" [parentTemplate]='servicesTemplate' [displayFunction]='servicesDisplayFunc'
-            [formGroup]="formGroup.get('services')" [viewOnly]='viewOnly' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
-            [autoCompleteConfiguration]="servicesAutoCompleteConfiguration" (onItemChange)="servicesOnItemChange($event)">
+				<mat-card>
+					<mat-card-header>
+						<mat-card-title class="thick" *ngIf='!viewOnly'>
+							{{'DATASET-EDITOR.FIELDS.SERVICES' | translate}}
+							<button mat-raised-button color="primary" (click)="addService()">
+								{{'DATASET-EDITOR.FIELDS.CREATE'|translate}}
+							</button>
+						</mat-card-title>
+					</mat-card-header>
+					<app-external-item-listing *ngIf="formGroup.get('services') && servicesTemplate && externalSourcesConfiguration"
+					 [options]="externalSourcesConfiguration.services" placeholder="{{'DATASET-EDITOR.FIELDS.SERVICES' | translate}}"
+					 [parentTemplate]='servicesTemplate' [displayFunction]='servicesDisplayFunc' [formGroup]="formGroup.get('services')"
+					 [viewOnly]='viewOnly' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc' [autoCompleteConfiguration]="servicesAutoCompleteConfiguration"
+					 (onItemChange)="servicesOnItemChange($event)">
 
-          </app-external-item-listing>
+					</app-external-item-listing>
 
-          <ng-template #servicesTemplate let-suggestion let-i="index" let-callback="function">
-            <div class="col-md-2">
-              <p>
-                {{i+1}}) {{suggestion.get('label').value}}
-              </p>
-            </div>
-            <div class="col-md-10">
-              <button mat-button (click)="callback(i)">
-                <mat-icon>close</mat-icon>
-              </button>
-            </div>
-          </ng-template>
-        </mat-card>
+					<ng-template #servicesTemplate let-suggestion let-i="index" let-callback="function">
+						<div class="col-md-2">
+							<p>
+								{{i+1}}) {{suggestion.get('label').value}}
+							</p>
+						</div>
+						<div class="col-md-10">
+							<button mat-button (click)="callback(i)">
+								<mat-icon>close</mat-icon>
+							</button>
+						</div>
+					</ng-template>
+				</mat-card>
 
-        <mat-card>
-          <mat-card-header>
-            <mat-card-title class="thick">
-              {{'DATASET-EDITOR.FIELDS.TAGS' | translate}}
-            </mat-card-title>
-          </mat-card-header>
-          <app-external-item-listing *ngIf="formGroup.get('tags') && tagsTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.tags"
-            placeholder="{{'DATASET-EDITOR.FIELDS.TAGS' | translate}}" [parentTemplate]='tagsTemplate' [displayFunction]='tagsDisplayFunc'
-            [formGroup]="formGroup.get('tags')" [viewOnly]='viewOnly' [subtitleFunction]='tagsDisplaySubtitleFunc' [autoCompleteConfiguration]="tagsAutoCompleteConfiguration"
-            (onItemChange)="tagsOnItemChange($event)">
+				<mat-card>
+					<mat-card-header>
+						<mat-card-title class="thick">
+							{{'DATASET-EDITOR.FIELDS.TAGS' | translate}}
+						</mat-card-title>
+					</mat-card-header>
+					<app-external-item-listing *ngIf="formGroup.get('tags') && tagsTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.tags"
+					 placeholder="{{'DATASET-EDITOR.FIELDS.TAGS' | translate}}" [parentTemplate]='tagsTemplate' [displayFunction]='tagsDisplayFunc'
+					 [formGroup]="formGroup.get('tags')" [viewOnly]='viewOnly' [subtitleFunction]='tagsDisplaySubtitleFunc'
+					 [autoCompleteConfiguration]="tagsAutoCompleteConfiguration" (onItemChange)="tagsOnItemChange($event)">
 
-          </app-external-item-listing>
+					</app-external-item-listing>
 
-          <ng-template #tagsTemplate let-suggestion let-i="index" let-callback="function">
-            <div class="col-md-2">
-              <p>
-                {{i+1}}) {{suggestion.get('name').value}}
-              </p>
-            </div>
-            <div class="col-md-10">
-              <button mat-button (click)="callback(i)">
-                <mat-icon>close</mat-icon>
-              </button>
-            </div>
-          </ng-template>
-        </mat-card>
+					<ng-template #tagsTemplate let-suggestion let-i="index" let-callback="function">
+						<div class="col-md-2">
+							<p>
+								{{i+1}}) {{suggestion.get('name').value}}
+							</p>
+						</div>
+						<div class="col-md-10">
+							<button mat-button (click)="callback(i)">
+								<mat-icon>close</mat-icon>
+							</button>
+						</div>
+					</ng-template>
+				</mat-card>
 
-        <div class="navigation-buttons-container">
-          <button matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
-          <button matStepperNext mat-raised-button color="primary" style="float:right;" (click)="getDefinition()">{{'DATASET-WIZARD.ACTIONS.NEXT'
-            | translate}}</button>
-        </div>
-      </form>
-    </mat-step>
-    <mat-step>
-      <ng-template matStepLabel>{{'DATASET-WIZARD.THIRD-STEP.TITLE' | translate}}</ng-template>
-      <app-dynamic-form class="full-width" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')"
-        [dataModel]="datasetWizardModel"></app-dynamic-form>
-      <div class="navigation-buttons-container">
-        <button style="margin-top:10px;" matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK'
-          | translate}}</button>
-      </div>
-    </mat-step>
-  </mat-horizontal-stepper>
+				<div class="navigation-buttons-container">
+					<button matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
+					<button matStepperNext mat-raised-button color="primary" style="float:right;" (click)="getDefinition()">{{'DATASET-WIZARD.ACTIONS.NEXT'
+						| translate}}</button>
+				</div>
+			</form>
+		</mat-step>
+		<mat-step>
+			<ng-template matStepLabel>{{'DATASET-WIZARD.THIRD-STEP.TITLE' | translate}}</ng-template>
+			<app-dynamic-form class="full-width" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition"
+			 [form]="this.formGroup.get('datasetProfileDefinition')" [dataModel]="datasetWizardModel"></app-dynamic-form>
+			<div class="navigation-buttons-container">
+				<button style="margin-top:10px;" matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK'
+					| translate}}</button>
+			</div>
+		</mat-step>
+	</mat-horizontal-stepper>
 </div>
diff --git a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html
index 0b9d5a32a..e0125d5ff 100644
--- a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.html
@@ -13,6 +13,13 @@
       <ng-container cdkColumnDef="label">
         <mat-header-cell *matHeaderCellDef mat-sort-header="label">{{'DATASET-LISTING.COLUMNS.NAME' | translate}}</mat-header-cell>
         <mat-cell *matCellDef="let row">{{row.label}}</mat-cell>
+	  </ng-container>
+
+	   <!-- Column Definition: Dmp -->
+	   <ng-container cdkColumnDef="project">
+        <mat-header-cell *matHeaderCellDef >{{'DATASET-LISTING.COLUMNS.PROJECT' |
+          translate}}</mat-header-cell>
+        <mat-cell *matCellDef="let row"> {{row.project}} </mat-cell>
       </ng-container>
 
       <!-- Column Definition: Dmp -->
diff --git a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
index fa1b0264c..98a39a266 100644
--- a/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/datasets/listing/dataset-listing.component.ts
@@ -35,7 +35,7 @@ export class DatasetListingComponent implements OnInit, IBreadCrumbComponent {
 	breadCrumbs: Observable<BreadcrumbItem[]>;
 
 	dataSource: DatasetDataSource | null;
-	displayedColumns: String[] = ['label', 'dmp', 'profile', 'status', 'description', 'created', 'actions'];
+	displayedColumns: String[] = ['label', 'project', 'dmp', 'profile', 'status', 'description', 'created', 'actions'];
 	pageEvent: PageEvent;
 	titlePrefix: String;
 	dmpId: string;
diff --git a/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts b/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts
index 9e04aaa23..e41e48325 100644
--- a/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts
+++ b/dmp-frontend/src/app/models/datasets/DatasetListingModel.ts
@@ -4,6 +4,7 @@ export class DatasetListingModel implements Serializable<DatasetListingModel> {
 	public id: String;
 	public label: String;
 	public dmp: String;
+	public project: String;
 	public profile: String;
 	public dataRepositories: String;
 	public registries: String;
@@ -18,6 +19,7 @@ export class DatasetListingModel implements Serializable<DatasetListingModel> {
 		this.id = item.id;
 		this.label = item.label;
 		this.dmp = item.dmp;
+		this.project = item.project;
 		this.profile = item.profile;
 		this.dataRepositories = item.dataRepositories;
 		this.registries = item.registries;
diff --git a/dmp-frontend/src/assets/lang/en.json b/dmp-frontend/src/assets/lang/en.json
index b48db54a0..63ca5be8d 100644
--- a/dmp-frontend/src/assets/lang/en.json
+++ b/dmp-frontend/src/assets/lang/en.json
@@ -110,6 +110,7 @@
 		"COLUMNS": {
 			"NAME": "Name",
 			"REFERNCE": "Reference",
+			"PROJECT": "Project",
 			"URI": "Uri",
 			"STATUS": "Status",
 			"DESCRIPTION": "Description",