diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java
index b70928c79..08f15cbf1 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java
@@ -27,6 +27,7 @@ import eu.eudat.logic.services.helpers.FileStorageService;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -91,7 +92,7 @@ public class ProjectManager {
 
             projects.add(project);
         }
-
+        projects.sort(Comparator.comparing(x-> x.getLabel()));
         return projects;
     }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
index d13920afc..9791c4904 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
@@ -141,7 +141,7 @@ public class WordBuilder {
                     number.setVal(BigInteger.valueOf(indent));
                 }
                 createFields(compositeField.getFields(), mainDocumentPart, 3, createListing, visibilityRuleService);
-                if (compositeField.getHasCommentField() && !createListing) {
+                if (compositeField.getHasCommentField() && compositeField.getCommentFieldValue() != null && !compositeField.getCommentFieldValue().isEmpty() && !createListing) {
                     XWPFParagraph paragraph = addParagraphContent("Comment: " + compositeField.getCommentFieldValue(), mainDocumentPart, ParagraphStyle.COMMENT, numId);
                     CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl();
                     number.setVal(BigInteger.valueOf(indent));