diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 76d59d0..b5588b6 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,7 +15,7 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type = "030">
+        <#if receipt.receipt_type = "030" && receipt.receipt_reference?? && receipt.receipt_reference!="">
         [
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
index 0c97524..75e0851 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -8,20 +8,10 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-            <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
           "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}",
-          </#if>
       <#else>
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot="">
-          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-          </#if>
-        </#if>
+        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       </#if>
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
index db598be..10fa71e 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -10,19 +10,9 @@
     },
     "ID": {
       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
           "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}",
-          </#if>
       <#else>
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot="">
-          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-          </#if>
-        </#if>
+        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       </#if>
 
       "RefDate": {
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
index 3bf617a..1aaa0c4 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -7,20 +7,10 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-            <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
           "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}",
-          </#if>
       <#else>
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot="">
-          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-          </#if>
-        </#if>
+        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       </#if>
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
index a151d2b..aac895c 100644
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -8,20 +8,10 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
           "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}",
-          </#if>
       <#else>
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot="">
-          <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-          </#if>
-        </#if>
+        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       </#if>
        "RefDate": {
         "DateTime": "${receipt_status_datetime}",