diff --git a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
index 23e9a4e..e248350 100644
--- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
+++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
+      "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
       },
     "Payload": {
        <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 5986e97..c0c9366 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -8,15 +8,14 @@
         },
         "ID": {
             <#if dispute.dispute_preparation??>
-                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
             <#else>
                 <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
                 </#if>
             </#if>
         },
         "Payload": {
-
             <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
                 "Title":"${dispute.dispute_reference?trim?json_string}",
              <#else>
@@ -27,6 +26,8 @@
                 <#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) />
                 <#if isCurrencyCode>
                     "Currency" : "${dispute.dispute_amount_unit?upper_case?json_string}",
+                <#--<#elseif isCurrencyCode!>
+                        "Currency" : "${TableAmount[dispute.dispute_amount_unit?json_string]}",-->
                 <#else>
                     "Currency" : "XXX",
                 </#if>
@@ -53,4 +54,7 @@
 
         }
     }
-]
\ No newline at end of file
+]
+
+
+
diff --git a/RFXtoRP_HsaDispute_MessageSent.ftl b/RFXtoRP_HsaDispute_MessageSent.ftl
index 4bd8534..58d430f 100644
--- a/RFXtoRP_HsaDispute_MessageSent.ftl
+++ b/RFXtoRP_HsaDispute_MessageSent.ftl
@@ -6,11 +6,11 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-              <#if dispute.dispute_preparation??>
-                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+               <#if dispute.dispute_preparation??>
+                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
             <#else>
                 <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
                 </#if>
             </#if>
         },
diff --git a/RFXtoRP_HsaDispute_MessageSent2.ftl b/RFXtoRP_HsaDispute_MessageSent2.ftl
index 4f14b46..801b503 100644
--- a/RFXtoRP_HsaDispute_MessageSent2.ftl
+++ b/RFXtoRP_HsaDispute_MessageSent2.ftl
@@ -6,18 +6,21 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-              <#if dispute.dispute_preparation??>
-                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+               <#if dispute.dispute_preparation??>
+                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
             <#else>
                 <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
                 </#if>
             </#if>
         },
         "Payload": {
 
-            "Message": "Item : ${dispute.dispute_item.item_code?trim?json_string} - Quantity : ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
-
+            <#if dispute.dispute_quantity!=0>
+                "Message": "Item : ${dispute.dispute_item.item_code?trim?json_string} - Quantity : ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
+            <#else>
+                "Message": "Item : ${dispute.dispute_item.item_code?trim?json_string}"
+            </#if>
         }
     }
 ]
\ No newline at end of file
diff --git a/RFXtoRP_HsaDispute_MessageSent3.ftl b/RFXtoRP_HsaDispute_MessageSent3.ftl
index f95882c..0965eac 100644
--- a/RFXtoRP_HsaDispute_MessageSent3.ftl
+++ b/RFXtoRP_HsaDispute_MessageSent3.ftl
@@ -6,11 +6,11 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-              <#if dispute.dispute_preparation??>
-                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+               <#if dispute.dispute_preparation??>
+                "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
             <#else>
                 <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
                 </#if>
             </#if>
         },