diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index d1bda44..3c6d214 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -83,16 +83,16 @@
                             <#stop "WMS type code not supported">
                         </#if>
                     </#if>
-                </#if>
             <#-- for Claim on anticipated receipt  -->
-            <#else>
-                <#if dispute.dispute_type_code=="020" >
-                    <#if dispute.dispute_anticipated_receipt.anticipated_receipt_reference?? && dispute.dispute_anticipated_receipt.anticipated_receipt_reference!="">
-                        "EntityID":"${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?json_string}",
-                        "DisplayID":"${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?json_string}",
-                    <#else>
-                        "EntityID":"AR-${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_year_number?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_number?json_string}",
-                        "DisplayID":"AR-${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_year_number?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_number?json_string}",
+                <#else>
+                    <#if dispute.dispute_type_code=="020" >
+                        <#if dispute.dispute_anticipated_receipt.anticipated_receipt_reference?? && dispute.dispute_anticipated_receipt.anticipated_receipt_reference!="">
+                            "EntityID":"${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?json_string}",
+                            "DisplayID":"${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?json_string}",
+                        <#else>
+                            "EntityID":"AR-${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_year_number?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_number?json_string}",
+                            "DisplayID":"AR-${dispute.dispute_anticipated_receipt.anticipated_receipt_physical_depot_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_activity_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_contractor_code?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_year_number?json_string}${dispute.dispute_anticipated_receipt.anticipated_receipt_number?json_string}",
+                        </#if>
                     </#if>
                 </#if>
             </#if>
diff --git a/RFXtoRP_HsaDispute_MessageSent.ftl b/RFXtoRP_HsaDispute_MessageSent.ftl
index e00e86f..acc1599 100644
--- a/RFXtoRP_HsaDispute_MessageSent.ftl
+++ b/RFXtoRP_HsaDispute_MessageSent.ftl
@@ -33,10 +33,10 @@
             <#else>
                 <#if dispute.dispute_reception??>
                     "Message": "${dispute.dispute_reception.reception_reference?trim?json_string}"
-                </#if>
-            <#else>
-                <#if dispute.dispute_anticipated_receipt??>
-                    "Message": "${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?trim?json_string}"
+                <#else>
+                    <#if dispute.dispute_anticipated_receipt??>
+                        "Message": "${dispute.dispute_anticipated_receipt.anticipated_receipt_reference?trim?json_string}"
+                    </#if>
                 </#if>
             </#if>