diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 094169e14..4b28a7fbf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -194,13 +194,13 @@ public class DataManagementPlanManager {
 
         wordBuilder.addParagraphContent("Organisations", document, ParagraphStyle.HEADER2, BigInteger.ZERO);
         if (dmpEntity.getOrganisations().size() > 0) {
-            wordBuilder.addParagraphContent(dmpEntity.getOrganisations().stream().map(x -> x.getLabel()).collect(Collectors.joining(", "))
+            wordBuilder.addParagraphContent(dmpEntity.getOrganisations().stream().map(Organisation::getLabel).collect(Collectors.joining(", "))
                     , document, ParagraphStyle.TEXT, BigInteger.ZERO);
         }
 
         wordBuilder.addParagraphContent("Researchers", document, ParagraphStyle.HEADER2, BigInteger.ZERO);
         if (dmpEntity.getResearchers().size() > 0) {
-            wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(x -> x.getLabel()).collect(Collectors.joining(", "))
+            wordBuilder.addParagraphContent(dmpEntity.getResearchers().stream().map(Researcher::getLabel).collect(Collectors.joining(", "))
                     , document, ParagraphStyle.TEXT, BigInteger.ZERO);
         }
 
@@ -214,7 +214,10 @@ public class DataManagementPlanManager {
         parBreakDMP.setPageBreak(true);
 
         wordBuilder.addParagraphContent("Datasets", document, ParagraphStyle.TITLE, BigInteger.ZERO);
-        dmpEntity.getDataset().stream().forEach(datasetEntity -> {
+        dmpEntity.getDataset().stream()
+                .filter(item -> item.getStatus() != Dataset.Status.CANCELED.getValue())
+                .filter(item -> item.getStatus() != Dataset.Status.DELETED.getValue())
+                .forEach(datasetEntity -> {
             Map<String, Object> properties = new HashMap<>();
             if (datasetEntity.getProperties() != null) {
                 JSONObject jobject = new JSONObject(datasetEntity.getProperties());