diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index dca6fc1..c2f881d 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -29,13 +29,13 @@
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
 				<#if appointment.Commissions.OrderID ?? && appointment.Commissions.OrderID!="">
 					"physical_receipt_list": [
-					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
+					<#list eventRP.executionflowCustomFields.entrySet() 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": "${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}"
 
 					}
 					<#sep>,</#sep>