diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 27e4d38..c515154 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -18,7 +18,7 @@
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
    <#if	preparationOrder.total_lv_validated !=0>
-      <#if preparationOrder.preparation_type_code=="010" || (preparationOrder.preparation_type_code=="030" && preparationOrder.preparation_line_lst[0].preparation_order_originator_reference!="")>
+      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
          [
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
index 881e2c1..3083c80 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -183,7 +183,8 @@
                   }
               }
             }
-            <#else>
+            </#if>
+          <#else>
             {
               "Header": {"ProjectID": "${projectRP}"},
               "ID": {