diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
index df66203..1ab5972 100644
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -9,29 +9,30 @@
   <#else>
     <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
   </#if>
-
-        <#if refIDHmap_local?size != 0 >
-        ,
-        </#if>
+   <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+      ,
+      </#if>
       <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
+      {
       "Header": {
       "ProjectID": "${projectRP}"
       },
       "ID":{
       "RefID": "${OrderOriginReference}"
       },
-    "Payload":{
-      "Carrier": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      "Payload":{
+        "Carrier": {
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+        }
+        <#-- Add transport grade code
+        <#if preparationOrder.transport_grade_code!="">
+        ,
+        "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+        </#if> -->
       }
-      <#-- Add transport grade code
-      <#if preparationOrder.transport_grade_code!="">
-      ,
-      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-      </#if> -->
-    }
-    }
+     }
+    </#if>
   </#list>
   <#assign refIDHmap_local ={}>
 ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
index 35bfc9c..d089f7c 100644
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -9,24 +9,25 @@
   <#else>
     <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
   </#if>
-
+    <#if !refIDHmap_local[OrderOriginReference]?? >
       <#if refIDHmap_local?size != 0 >
-    ,
-    </#if>
-    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
-      "Header": {
-      "ProjectID": "${projectRP}"
-      },
-      "ID":{
-      "RefID": "${OrderOriginReference}"
-      },
-    "Payload":{
-      "Carrier": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      ,
+      </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+      {
+        "Header": {
+        "ProjectID": "${projectRP}"
+        },
+        "ID":{
+        "RefID": "${OrderOriginReference}"
+        },
+      "Payload":{
+        "Carrier": {
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+        }
       }
-    }
-    }
+      }
+    </#if>
   </#list>
   <#assign refIDHmap_local ={}>
 ]
\ No newline at end of file