diff --git a/Common/Docu/SoftwareDesign/Quick Reference GenesisToolBox Main and Setup.docx b/Common/Docu/SoftwareDesign/Quick Reference GenesisToolBox Main and Setup.docx
index d248f992..5c1541a4 100644
Binary files a/Common/Docu/SoftwareDesign/Quick Reference GenesisToolBox Main and Setup.docx and b/Common/Docu/SoftwareDesign/Quick Reference GenesisToolBox Main and Setup.docx differ
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs
index 3bf08da1..7f820357 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateBuilder/FrmFwUpdateBuilder.cs
@@ -612,9 +612,11 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
                 else
                 {
                     // format is orderNumber-position e.g. 12345678-10
-                    var orderText = cbxCordonelProductionOrdersSearch.SelectedItem.ToString().Split('-');
-                    if (Int64.TryParse(orderText[0], out var orderNumber) &&
-                        Int64.TryParse(orderText[1], out var orderPosition))
+                    var orderText = cbxCordonelProductionOrdersSearch.SelectedItem.ToString();
+                    orderText = Regex.Replace(orderText, @"[^0-9\-]", "");
+                    var orderTexts = orderText.Split('-');
+                    if (Int64.TryParse(orderTexts[0], out var orderNumber) &&
+                        Int64.TryParse(orderTexts[1], out var orderPosition))
                     {
                         foreach (var order in _fwUpdateDbAccess.DbCordonelCustomerOrders.Where(order =>
                             order.CustomerOrderNumber == orderNumber &&
@@ -4788,7 +4790,7 @@ namespace Xylem.ServiceFwUpdate.Ui.FwUpdateBuilder
                                 }
                             }
 
-                            cordonel.Region = string.IsNullOrEmpty(cordonel.RadioFrequency) ? "NA" : "EMEA";
+                            cordonel.Region = string.IsNullOrEmpty(cordonel.RadioFrequency) || cordonel.RadioFrequency == "0" ? "NA" : "EMEA";
                             _cordonelProductionSearchInfos.Add(cordonel);
                         }
                     }