diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 76603fa..2c88da1 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -43,23 +43,22 @@
 							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 						}
 					</#if>
-				<#else>
-					<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
-						<#if eventRP.appointmentCustomFields?has_content>
-						{
-							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number>
-							"apiRestReflexID" :  "${apiRestReflexID}",
-							"datas" :
-							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl">
-						}
-						<#else>
-						{
-							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref>
-							"apiRestReflexID" :  "${apiRestReflexID}",
-							"datas" :
-							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
-						}
-						</#if>
+				</#if>
+				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+					<#if eventRP.appointmentCustomFields?has_content>
+					{
+						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number>
+						"apiRestReflexID" :  "${apiRestReflexID}",
+						"datas" :
+						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl">
+					}
+					<#else>
+					{
+						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref>
+						"apiRestReflexID" :  "${apiRestReflexID}",
+						"datas" :
+						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
+					}
 					</#if>
 				</#if>
 			<#else>
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
index ab13261..39f9177 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
@@ -9,20 +9,18 @@
 	},
 	"payload" :
 	 {
-            <#assign executionflowCustomFields = eventRP.executionflowCustomFields >    
-				"physical_receipt_list": [
-				<#list addedCommissions as addedCommission>
-	
-				{
-					"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
-					"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
-					"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
-					"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
-					"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
-				}
-				<#sep>,</#sep>
-				</#list>
-				]
-		</#if>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.addedCommissions as addedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
  }
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
index 42ffb38..333c8a0 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
@@ -8,16 +8,18 @@
 	},
 	"payload" :
 	 {
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
 		<#list eventRP.addedCommissions as addedCommission>
-			<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as CustomFields>
-				"physical_receipt_list": [
-				{
-					"receipt_activity": "${commission.value.activity_code?json_string}",
-					"originator_code": "${commission.value.originator_code?json_string}",
-					"physical_receipt_reference": "${commission.value.reference?json_string}",
-					"receipt_year": "${commission.value.order_year?json_string}",
-					"receipt_number": "${commission.value.order_number?json_string}"
-				}
-				]
+		{
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
  }
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
index bc57059..98a1e34 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl
@@ -9,22 +9,18 @@
 	},
 	"payload" :
 	 {
-		<#if appointment.Commissions??>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				"physical_receipt_list": [
-				{
-					"receipt_activity": "${commission.value.activity_code?json_string}",
-					"originator_code": "${commission.value.originator_code?json_string}",
-					"physical_receipt_reference": "${commission.value.reference?json_string}",
-					"receipt_year": "${commission.value.order_year?json_string}",
-					"receipt_number": "${commission.value.order_number?json_string}"
-				}
-				]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"${appointment.Reason!""?json_string}"
-				</#if>
-			</#if>
-		</#if>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.removedCommissions as removedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
  }
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
index 34b7ed5..ed11aad 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl
@@ -8,22 +8,18 @@
 	},
 	"payload" :
 	 {
-		<#if appointment.Commissions??>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				"physical_receipt_list": [
-				{
-					"receipt_activity": "${commission.value.activity_code?json_string}",
-					"originator_code": "${commission.value.originator_code?json_string}",
-					"physical_receipt_reference": "${commission.value.reference?json_string}",
-					"receipt_year": "${commission.value.order_year?json_string}",
-					"receipt_number": "${commission.value.order_number?json_string}"
-				}
-				]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"${appointment.Reason!""?json_string}"
-				</#if>
-			</#if>
-		</#if>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.removedCommissions as removedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
  }