diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java
index 836c32b..837eb00 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelReportGenerationService.java
@@ -352,7 +352,7 @@ public class ExcelReportGenerationService {
 
     private boolean isRedactionPlaceholder(String text) {
 
-        return prefixRedactionPlaceholders.stream().anyMatch(text::startsWith) || redactionPlaceholders.contains(text);
+        return prefixRedactionPlaceholders.stream().anyMatch(text::startsWith) || redactionPlaceholders.stream().anyMatch(text::contains);
     }
 
 
@@ -419,7 +419,7 @@ public class ExcelReportGenerationService {
                     anchor.setRow1(cell.getRowIndex());
 
                     //Creates the top-level drawing patriarch.
-                    Drawing drawing = sheet.createDrawingPatriarch();
+                    Drawing<?> drawing = sheet.createDrawingPatriarch();
 
                     Picture picture = drawing.createPicture(anchor, pictureIdx);
                     picture.resize(factor);