diff --git a/ActorPrefix.ftl b/ActorPrefix.ftl
index 4756b31..d995203 100644
--- a/ActorPrefix.ftl
+++ b/ActorPrefix.ftl
@@ -38,7 +38,7 @@
     <#local depot = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local depot = actor[4..]>
+        <#local depot = actor[4..]>
     <#else>
         <#local depot = actor>
     </#if>
@@ -83,7 +83,7 @@
     <#local supplier = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local supplier = actor[4..]>
+        <#local supplier = actor[4..]>
     <#else>
         <#local supplier = actor>
     </#if>
@@ -126,7 +126,7 @@
     <#local carrier = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local carrier = actor[4..]>
+        <#local carrier = actor[4..]>
     <#else>
         <#local carrier = actor>
     </#if>
@@ -169,7 +169,7 @@
     <#local consignee = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local consignee = actor[4..]>
+        <#local consignee = actor[4..]>
     <#else>
         <#local consignee = actor>
     </#if>
diff --git a/RFXtoRP_HsaDesPatch.ftl b/RFXtoRP_HsaDesPatch.ftl
index 49be51c..63a0b4e 100644
--- a/RFXtoRP_HsaDesPatch.ftl
+++ b/RFXtoRP_HsaDesPatch.ftl
@@ -17,7 +17,7 @@
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	  <#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsaDespNt.ftl b/RFXtoRP_HsaDespNt.ftl
index b2f6909..f385bfd 100644
--- a/RFXtoRP_HsaDespNt.ftl
+++ b/RFXtoRP_HsaDespNt.ftl
@@ -17,7 +17,7 @@
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsrLoadInfo.ftl b/RFXtoRP_HsrLoadInfo.ftl
index 0187443..f4a6010 100644
--- a/RFXtoRP_HsrLoadInfo.ftl
+++ b/RFXtoRP_HsrLoadInfo.ftl
@@ -18,14 +18,14 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
        <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE *************************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
        <#stop>
-       <#break>
+	<#break>
 
     <#default>
           <#stop >
diff --git a/RFXtoRP_HsrPackBranch.ftl b/RFXtoRP_HsrPackBranch.ftl
index bef2979..d0a3e31 100644
--- a/RFXtoRP_HsrPackBranch.ftl
+++ b/RFXtoRP_HsrPackBranch.ftl
@@ -17,7 +17,7 @@
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsrPackOrder.ftl b/RFXtoRP_HsrPackOrder.ftl
index a723ebb..6a5dff8 100644
--- a/RFXtoRP_HsrPackOrder.ftl
+++ b/RFXtoRP_HsrPackOrder.ftl
@@ -17,7 +17,7 @@
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 4dbf993..343103b 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -27,6 +27,10 @@
 	<#case "Updated">
 	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
+
+		<#if !eventRP.commissionsUpdated!false && !eventRP.reasonUpdated!false && !eventRP.slotUpdated!false && !eventRP.carrierInformationUpdated!false>
+			<#stop>
+		</#if>
 	[
 		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
 		{
diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 3bbf34c..239662e 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -37,15 +37,15 @@
 			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
-		"consolidated_delivery": "${consolidated_delivery_flag}",
+		"consolidated_delivery": "false",
 		"pick_sequence_code": "${pick_sequence_code}",
 		"intermediate_consignee": "false",
-		"protected": "${protected_flag}",
-        "automatic_generation": "${automatic_generation_flag}",
+		"protected": "false",
+        "automatic_generation": "true",
 		"deactivate": "false",
 		"optional_attributes": {
 			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
-			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
+			"apt_with_end_consignee": "false",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
 		  	}
diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
index 6d51468..d675f0a 100644
--- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
+++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
@@ -18,11 +18,7 @@
 <#assign originator_code = ""/>
 <#assign preparation_type_code = ""/>
 <#assign requested_delivery_date_type = ""/>
-<#assign consolidated_delivery_flag ="false"/>
 <#assign pick_sequence_code = ""/>
-<#assign protected_flag ="false"/>
-<#assign automatic_generation_flag ="false"/>
-<#assign apt_with_end_consignee_flag="false"/>
 
 <#-- A supprimer si utilisation de la table de correspondance-->
 <#--To be deleted if using the correspondence table-->