diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index ebff2ce..8d8c1de 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -36,13 +36,13 @@
 		  	},
 		<#if executionflow.ShipTo.ActorID == ""> 
 		"address": {
-				"first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}",
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}",
+				"first_name": "${executionflow.ShipTo.Contact.FirstName}",
+				"last_name" :"${executionflow.ShipTo.Contact.Lastname}",
 				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
 				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
-				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}",
-				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo?json_string!""}",
-				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree?json_string!""}",
+				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne}",
+				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo}",
+				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree}",
 				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
 				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
 			  },