diff --git a/RFXtoRP_HfGrade.ftl b/RFXtoRP_HfGrade.ftl
index 39f6d2f..5d33f00 100644
--- a/RFXtoRP_HfGrade.ftl
+++ b/RFXtoRP_HfGrade.ftl
@@ -9,7 +9,7 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Grades">
+		<#stop>
 	<#break>
 
 
diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl
index f9b3b04..8a15c6f 100644
--- a/RFXtoRP_HfLvTypeList.ftl
+++ b/RFXtoRP_HfLvTypeList.ftl
@@ -9,9 +9,7 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-
-		<#stop "no generic FTL file available yet for LV types">
-
+	<#stop>
 	<#break>
 
 
diff --git a/RFXtoRP_HfOwner.ftl b/RFXtoRP_HfOwner.ftl
index 6d23fd2..8a15c6f 100644
--- a/RFXtoRP_HfOwner.ftl
+++ b/RFXtoRP_HfOwner.ftl
@@ -9,7 +9,7 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Owners">
+	<#stop>
 	<#break>
 
 
diff --git a/RFXtoRP_HsaDesPatch.ftl b/RFXtoRP_HsaDesPatch.ftl
index 202981f..63a0b4e 100644
--- a/RFXtoRP_HsaDesPatch.ftl
+++ b/RFXtoRP_HsaDesPatch.ftl
@@ -16,16 +16,16 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for desPatch">
-      <#break>
+      <#stop>
+	  <#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for desPatch">
-      <#break>
+      <#stop>
+	<#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsaDespNt.ftl b/RFXtoRP_HsaDespNt.ftl
index da1d0c2..f385bfd 100644
--- a/RFXtoRP_HsaDespNt.ftl
+++ b/RFXtoRP_HsaDespNt.ftl
@@ -16,16 +16,16 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for despNt">
-      <#break>
+      <#stop>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for despNt">
-      <#break>
+      <#stop>
+	<#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl
index 1be2932..7fb0837 100644
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -60,7 +60,7 @@
         </#if>
         "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
         <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
-          "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
+          "OperationReference": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}-${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
         </#if>
 
         "Quantity":
diff --git a/RFXtoRP_HsrLoadInfo.ftl b/RFXtoRP_HsrLoadInfo.ftl
index 1e7ac8c..f4a6010 100644
--- a/RFXtoRP_HsrLoadInfo.ftl
+++ b/RFXtoRP_HsrLoadInfo.ftl
@@ -17,23 +17,15 @@
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-          {
-
-          }
-       ]
-      <#break>
+       <#stop>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE *************************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-           {
-
-           }
-       ]
-       <#break>
+       <#stop>
+	<#break>
 
     <#default>
           <#stop >
diff --git a/RFXtoRP_HsrPackBranch.ftl b/RFXtoRP_HsrPackBranch.ftl
index f0f360e..d0a3e31 100644
--- a/RFXtoRP_HsrPackBranch.ftl
+++ b/RFXtoRP_HsrPackBranch.ftl
@@ -16,16 +16,16 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for Pack Branch">
-      <#break>
+      <#stop>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for  Pack Branch">
-      <#break>
+      <#stop>
+	<#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsrPackOrder.ftl b/RFXtoRP_HsrPackOrder.ftl
index 63a612d..6a5dff8 100644
--- a/RFXtoRP_HsrPackOrder.ftl
+++ b/RFXtoRP_HsrPackOrder.ftl
@@ -16,16 +16,16 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for Pack Order">
-      <#break>
+      <#stop>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for Pack Order">
-      <#break>
+      <#stop>
+	<#break>
     <#default>
           <#stop >
 </#switch>