diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl
index ff2a9e1..2ff64dd 100644
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -14,6 +14,7 @@
 
 <#switch cloudEventMsg.action>
   <#case "C">
+  <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
@@ -24,17 +25,16 @@
               "datas" :
               <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
             },
-			{                                                                                 
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>    
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",                                
-              "datas" :                                                                         
-              <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl">                 
-            }                                                                                  
+			{
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl">
+            }
        ]
   <#break>
-
     <#case "U">
-      <#-- *********************************************** Action = Update ******************** -->
+    <#--   *********************************************** Action = Update ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
         <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
 		[
@@ -44,7 +44,7 @@
 			"datas" :
 			<#include "RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl">
 			}
-	    ]	
+	    ]
          <#break>
 
 <#case "D">
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index 462663c..7d19212 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -3,15 +3,15 @@
         "Header":{
           "ProjectID": "${projectRP}"
         },
-		"ActorID": "${RPtoRFXprefixDepot("DPF")}",
+		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 		"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
 		"TimeZone":"${time_zone_rfx}",
-		 <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">           
+		 <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
         	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") ||  carrier_apt.planned_unloading_end_datetime?starts_with("00")>
 			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
 		   </#if>
-		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>  
-		   <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />			   
+		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
+		   <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
 		<#else>
 			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
 			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?starts_with("00")>
@@ -32,12 +32,12 @@
 		"AppointmentType": "${appointmentType}",
 		"Emails": ["francis.reat@hardis-group.com","laurie.montant@hardis-group.com"], <#-- à changer -->
 
-        "SegmentationSelections" : [
-			{
-				"SegmentationID" : "secteur",<#-- à changer -->
-				"SegmentationValueID" : "n1-mh0plpq3-6n1x56plog4"<#-- à changer -->
-			}
-		],
+            "SegmentationSelections":[
+			{ "SegmentationID":"Securise",
+			"SegmentationValueID":"yes"},
+			{ "SegmentationID":"Secteur",
+			"SegmentationValueID":"frais"}
+			],
 		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)>
         	"Commissions": [
 				<#list carrier_apt.physical_receipt_list as physical_receipt>
@@ -71,7 +71,7 @@
 					"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
 				    <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso) />
-					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">					
+					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 						<#if (duration >= 0) >
 							"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 						<#else>