diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index fd17993..8144675 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -34,17 +34,7 @@
           <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
             "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
           <#else>
-            <#if
-            <#-- preparation_order.address.type_code == "" &&
-            preparation_order.address.title_code == "" &&
-            preparation_order.address.first_name == "" &&
-            preparation_order.address.last_name == "" &&
-            preparation_order.address.mail_address == "" &&
-            preparation_order.address.contact_type_code == "" &&
-            preparation_order.address.mobile_phone_number == "" &&
-            preparation_order.address.land_line_phone_number == "" &&
-            preparation_order.address.fax_number == "" && -->
-            preparation_order.address.address_type_code == "" &&
+            <#if preparation_order.address.address_type_code == "" &&
             preparation_order.address.name_or_company_name == "" &&
             preparation_order.address.additional_address_data_1 == "" &&
             preparation_order.address.additional_address_data_2 == "" &&
@@ -117,7 +107,7 @@
              "RequestedDeliveryDateTime" :
              {
               <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00">
-                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.intermediate_delivery_start_datetime,time_zone_offset_rfx) />
+                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) />
                 "DateTime": "${intermediate_delivery_start_datetime}",
                 "AuthorTimeZone": "${time_zone_rfx}"
               <#else>