diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index c77f7f5..ec93dff 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -15,7 +15,7 @@
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
 		 <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
-        	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") ||  carrier_apt.planned_unloading_end_datetime?starts_with("00")>
+        	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-")>
 			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
 		   </#if>
 		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
@@ -25,7 +25,7 @@
 		   </#if>
 		<#else>
 			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
-			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?starts_with("00")>
+			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?contains("-00-")>
 			       <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
 		       </#if>
 				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION>
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
index 79910bf..540e2eb 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl
@@ -68,7 +68,7 @@
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
 		 <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
-        	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") ||  carrier_apt.planned_unloading_end_datetime?starts_with("00")>
+        	<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") ||  carrier_apt.planned_unloading_end_datetime?starts_with("00") ||  carrier_apt.planned_unloading_end_datetime?contains("-00-")>
 			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
 		   </#if>
 		   <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
@@ -78,7 +78,7 @@
 		   </#if>
 		<#else>
 			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
-			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?starts_with("00")>
+			   <#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") ||  carrier_apt.planned_load_end_datetime?contains("-00-")>
 			       <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
 		       </#if>
 				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION>