diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 0df6f4f..aa1e6ec 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -96,7 +96,7 @@
 				{
 				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
-				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_code": "${line.RequestedContent.Goods.ItemID?json_string!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
 				"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code_to_prepare" :"${owner_code_to_prepare}",
diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index 90ef77a..bd37d24 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -50,7 +50,7 @@
 			{
 				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
-				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_code": "${line.RequestedContent.Goods.ItemID?json_string!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",