diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl
index c2d33a9..1f22d6b 100644
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -37,7 +37,7 @@
             "LVID": "${logistical_variant.logistical_variant_code?json_string}",
             "Name" : "${logistical_variant.lv_type_code?json_string}",
 
-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index ee94331..4412001 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index ee94331..4412001 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index ee94331..4412001 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"