diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index d9afb7f..a9e0e08 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -6,6 +6,7 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">
 
 <#assign aDateTime = .now>
 
@@ -54,7 +55,7 @@
             <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
             <#list preparation_line.despatched_ipg_list as despatched_ipg>
             <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
+            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (supplyOfTheTrackingNumber!=0 || (despatched_ipg.consignment_unit_id!="" && supplyOfTheTrackingNumber==1))>
                <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                ,
                {
diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
index 11f78c6..e738a40 100644
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -10,14 +10,9 @@
     },
     "ID": {
       <#switch supplyOfTheTrackingNumber>
-        <#case 0>
-          "RefID":" ",
-        <#break>
         <#case 1>
           <#if despatched_ipg.consignment_unit_id!="">
 			      "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          <#else>
-            "RefID":" ",
           </#if>
         <#break>
         <#case 2>