diff --git a/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
index 325650a..00595f4 100644
--- a/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
@@ -8,10 +8,10 @@
 	},
 	"payload" :
 	 {
-		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
-		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
 		<#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
+		   		"unloading_appointment" : "false",
+				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -21,6 +21,8 @@
 				</#if>
 			<#break>
 		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
+				"unloading_appointment" : "true",
+				"load_appointment" : "false",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
diff --git a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
index 870fc50..8c9f571 100644
--- a/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
+++ b/RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl
@@ -9,10 +9,10 @@
 	"payload" :
 	 {
 		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
-		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
-		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
        <#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
+				"unloading_appointment" : "false",
+				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -22,6 +22,8 @@
 				</#if>
 			<#break>
 		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
+				"unloading_appointment" : "true",
+				"load_appointment" : "false",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",