diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java
index f73ab12..445b08f 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/EntityLogConverterService.java
@@ -70,8 +70,8 @@ public class EntityLogConverterService {
     private Map<String, String> fillMapOfTypeAndEntityDisplayName(String dossierId) {
 
         List<Type> typeList = new ArrayList<>();
-        typeList.addAll(dictionaryClient.getAllTypesForDossier(dossierId, null, false));
-        typeList.addAll(dictionaryClient.getAllTypesForDossierTemplate(dossierClient.getDossierById(dossierId, true, false).getDossierTemplateId(), null, false));
+        typeList.addAll(dictionaryClient.getAllTypesForDossier(dossierId, null, true));
+        typeList.addAll(dictionaryClient.getAllTypesForDossierTemplate(dossierClient.getDossierById(dossierId, true, false).getDossierTemplateId(), null, true));
 
         Map<String, String> mapOfEntityDisplayName = new HashMap<>();
 
@@ -166,7 +166,8 @@ public class EntityLogConverterService {
                                                                        getJustificationReason(legalBasisMappings, entry),
                                                                        checkTextForNull(entry.getTextBefore()) + entry.getValue() + checkTextForNull(entry.getTextAfter()),
                                                                        entry.getValue(),
-                                                                       mapOfEntityDisplayName.get(entry.getType()),
+                                                                       mapOfEntityDisplayName.get(entry.getType())
+                                                                       == null ? entry.getType() : mapOfEntityDisplayName.get(entry.getType()),
                                                                        entry.getState() == EntryState.SKIPPED || entry.getState() == EntryState.IGNORED));
                         }
                     }