diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl
index 38e0f9f..a84f8d6 100644
--- a/RPtoRFX_AppointmentEvent.ftl
+++ b/RPtoRFX_AppointmentEvent.ftl
@@ -28,7 +28,7 @@
 		<#assign appointment = eventRP.data />
 		[
 			<#if eventRP.appointmentCustomFields?has_content>
-			<#list eventRP.executionflowCustomFields as commission>
+			<#list eventRP.executionflowCustomFields.entrySet()(l ->l.value?? && l.value?has_content) as commission>
 				{
 					<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
 					"apiRestReflexID" :  "${apiRestReflexID}",
@@ -42,6 +42,7 @@
 					"datas" :
 					<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
 				}
+			<#sep>,</#sep>
 			</#list>
 			</#if>
 		]
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
index 9d8f372..c992b1f 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl
@@ -12,16 +12,13 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
 				{
-					"receipt_activity": "${custom.value.activity_code?json_string}",
-					"originator_code": "${custom.value.originator_code?json_string}",
-					"physical_receipt_reference": "${custom.value.reference?json_string}",
-					"receipt_year": "${custom.value.order_year?json_string}",
-					"receipt_number": "${custom.value.order_number?json_string}"
+					"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}"
 				}
-				<#sep>,</#sep>
-				</#list>
 				]
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
index 3185e63..1ec4382 100644
--- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl
@@ -11,16 +11,13 @@
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				"physical_receipt_list": [
-				<#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
 				{
-					"receipt_activity": "${custom.value.activity_code?json_string}",
-					"originator_code": "${custom.value.originator_code?json_string}",
-					"physical_receipt_reference": "${custom.value.reference?json_string}",
-					"receipt_year": "${custom.value.order_year?json_string}",
-					"receipt_number": "${custom.value.order_number?json_string}"
+					"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}"
 				}
-				<#sep>,</#sep>
-				</#list>
 				]
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">