diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
index 60bca2f..a5d738b 100644
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -25,7 +25,9 @@
          "ItemID": "${stock.item_code}",  
          "LVBranchID": "${stock.item_logistical_variant_code}",
          <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> 
-         "PriorityDate" : "${priority_date}",
+         <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
+          "PriorityDate" : "${priority_date}",
+         </#if>
          
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">
diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl
index 5fb123e..7715ea3 100644
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -45,7 +45,7 @@
           >
          [
          {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> 
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> 
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :         
            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
@@ -58,7 +58,7 @@
       </#if>
       </#if>
       <#else>
-      <#-- cases of an IPG move with quantity = 0 (weight modification))--> 
+      <#-- cases of an IPG move with quantity = 0 (weight modification)--> 
          <#stop "move ignored quantity = 0">
          </#if>
       <#break>
diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index eba3211..17cc8d6 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -67,13 +67,13 @@
 			"grade_code_to_prepare" :"${grade_code_to_prepare}",
 			"input_order_data": "false",
 			"batch_1": "${batch_1}",
+			"base_lv_quantity": "true",
 			"any_lv": "false"	
 			<#-- 
       		"stock_reservation": "false",
             "forced_priority_date_min_lead_time": "false",
             "temp_substitution_possible": "false",
-            "substitution_possible": "false",
-            "base_lv_quantity": "true",
+            "substitution_possible": "false"
 			-->
             
 		}<#sep>,</#sep>