diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
index 26e8795..0c97524 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -8,20 +8,18 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+            <#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>
-          <#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.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>
-            <#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>
         </#if>
       </#if>
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
index f07d206..db598be 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -13,19 +13,18 @@
         <#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>
-          <#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.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>
-            <#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>
         </#if>
       </#if>
+
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
index b093ff6..3bf617a 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -7,20 +7,18 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+            <#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>
-          <#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.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>
-            <#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>
         </#if>
       </#if>
diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
index 71e358c..a151d2b 100644
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -8,20 +8,18 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+      <#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>
-          <#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.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>
-            <#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>
         </#if>
       </#if>