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 73d6532..d7beb99 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
@@ -161,21 +161,17 @@ public class EntityLogConverterService {
                             Optional<EntityLogLegalBasis> optionalEntityLogLegalBasis = legalBasisMappings.stream()
                                     .filter(lbm -> lbm.getTechnicalName().equalsIgnoreCase(entry.getLegalBasis()))
                                     .findAny();
-                            String legalBasisText = optionalEntityLogLegalBasis.map(entityLogLegalBasis -> entityLogLegalBasis.getReason()
-                                                                                                           + " "
-                                                                                                           + entityLogLegalBasis.getDescription())
-                                    .orElse("");
-                            String legalBasisReason = optionalEntityLogLegalBasis.map(EntityLogLegalBasis::getReason)
-                                    .orElse("");
+
+                            EntityLogLegalBasis entityLogLegalBasis = optionalEntityLogLegalBasis.orElse(new EntityLogLegalBasis("", "", "", ""));
 
                             reportEntries.add(new ReportRedactionEntry(position.getPageNumber(),
                                                                        position.x(),
                                                                        position.y(),
                                                                        getSection(entry, position),
-                                                                       legalBasisReason,
-                                                                       legalBasisText,
+                                                                       entityLogLegalBasis.getReason() + " " + entityLogLegalBasis.getDescription(),
+                                                                       entityLogLegalBasis.getReason(),
                                                                        entry.getParagraphPageIdx(),
-                                                                       legalBasisReason,
+                                                                       entityLogLegalBasis.getDescription(),
                                                                        checkTextForNull(entry.getTextBefore()) + entry.getValue() + checkTextForNull(entry.getTextAfter()),
                                                                        entry.getValue(),
                                                                        mapOfEntityDisplayName.get(entry.getType())