diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl
index 18ea1ec..160f8f9 100644
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -16,13 +16,16 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
        [
-          <#if dispute.dispute_closed == true >
+           <#if dispute.dispute_closed == true >
+            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsaDispute_Created.ftl">
-            },
+            }
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
+              ,
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -30,7 +33,11 @@
               <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
             }
             <#else>
-              <#stop>
+                <#stop>
+              </#if>
+            <#else>
+              <#stop >
+            </#if>
           </#if>
        ]
   <#break>
diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 499d4f4..335e29b 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -42,31 +42,20 @@
             <#-- To configure -->
             <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
             <#if dispute.dispute_type_code=="050" >
-                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
-                  "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                    <#if TableReasonCode[dispute.dispute_reason_code]??>
-                        "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
-                    <#else>
-                        <#stop "Reason code not supported">
-                    </#if>
-                <#else>
-                    <#stop "Preparation order list is empty">
-                </#if>
+                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
             <#else>
                 <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
-                    <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="">
                         "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
-                        <#if TableReasonCode[dispute.dispute_reason_code]??>
-                            "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
-                        <#else>
-                            <#stop "Reason code not supported">
-                        </#if>
-                    <#else>
-                        <#stop "Reception reference is empty">
-                    </#if>
+                <#else>
+                    <#stop "WMS type code not supported">
                 </#if>
+            </#if>
+
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
             <#else>
-                    <#stop "Type not supported">
+                <#stop "Reason code not supported">
             </#if>
         }
     }