diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 245229e..e61a78c 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -63,70 +63,70 @@
               "datas" :
               <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
             }
+          <#else>
+            <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+            }
             <#else>
-              <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-              }
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                }
               <#else>
-                <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                <#if receipt.receipt_confirmed == "true" >
                   {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                   "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                   }
                 <#else>
-                  <#if receipt.receipt_confirmed == "true" >
-                    {
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                    "datas" :
-                    <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-                    }
-                  <#else>
-                    <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "false">
-                      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-                      [
-                        {
-                          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                          "datas" :
-                          <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-
-                        },
-                        {
-                          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-                          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                          "datas" :
-                          <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-
-                        }
-                      ]
-                      <#else>
-                        <#stop> <#-- Receipt reference for transfer is empty-->
-                      </#if>
-                    <#else>
+                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false">
+                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                    [
                       {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                         "datas" :
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                        <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
                       },
                       {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+                      }
+                    ]
+                    <#else>
+                      <#stop> <#-- Receipt reference for transfer is empty-->
+                    </#if>
+                  <#else>
+                    {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                       "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                       "datas" :
-                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-                      }
-                    </#if>
+                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                    },
+                    {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                    "datas" :
+                    <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                    }
                   </#if>
                 </#if>
               </#if>
             </#if>
+          </#if>
        ]
       <#break>