diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index c2f881d..a1a0012 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -27,9 +27,9 @@
 		<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
 		<#if appointment.Commissions??>
 			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				<#if appointment.Commissions.OrderID ?? && appointment.Commissions.OrderID!="">
+				<#if appointment.Commissions[0].OrderID?? && appointment.Commissions[0].OrderID!="">
 					"physical_receipt_list": [
-					<#list eventRP.executionflowCustomFields.entrySet() as custom>
+					<#list eventRP.executionflowCustomFields.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}",