diff --git a/data/SetupData.xml b/data/SetupData.xml
index c3260d8..a132bac 100644
--- a/data/SetupData.xml
+++ b/data/SetupData.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity-facade-xml type="ext-seed">
-    <moqui.screen.SubscreensItem screenLocation="component://webroot/screen/webroot/apps.xml"
-                             subscreenName="OrderRouting" subscreenLocation="component://order-routing/screen/OrderRoutingGroup.xml"
-                             menuTitle="Order Routing Setup" menuIndex="9" menuInclude="Y"/>
-
     <artifactGroups artifactGroupId="ORDER_ROUTE_APP" description="Order routing app">
         <artifacts artifactName="component://order-routing/screen/OrderRoutingGroup.xml" artifactTypeEnumId="AT_XML_SCREEN" inheritAuthz="Y"/>
         <!-- Full permissions for the ADMIN user group -->
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroupRuns.xml b/screen/OrderRoutingGroup/OrderRoutingGroupRuns.xml
index 188cd65..bbf931f 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroupRuns.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroupRuns.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing Group Runs" default-menu-index="2">
+        default-menu-title="Routing Group Runs" default-menu-index="2">
 
     <subscreens default-item="OrderRoutingGroupRunList"/>
     <widgets>
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml b/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml
index c276493..16dc615 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-include="false" standalone="true">
+        default-menu-include="false" standalone="true" default-menu-title="Group Runs">
 
     <parameter name="routingGroupId"/>
     <transition name="orderRoutingGroup"><default-response url="../../OrderRoutingGroups/OrderRoutingGroupDetail"/></transition>
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroups.xml b/screen/OrderRoutingGroup/OrderRoutingGroups.xml
index 9639de4..b17853a 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroups.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroups.xml
@@ -13,8 +13,9 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing Groups" default-menu-index="1">
+        default-menu-title="Routing Groups" default-menu-index="1">
 
+    <parameter name="routingGroupId"/>
     <subscreens default-item="OrderRoutingGroupList"/>
     <widgets>
         <subscreens-panel id="OrderRoutingGroupListPanel" type="popup"/>
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting.xml b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting.xml
index 099d37f..9738420 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting.xml
@@ -13,8 +13,8 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing" default-menu-index="0" default-menu-include="false">
-
+        default-menu-title="Routing" default-menu-index="0" default-menu-include="false">
+    <parameter name="orderRoutingId"/>
     <subscreens default-item="OrderRoutingDetail"/>
     <widgets>
         <subscreens-panel id="OrderRoutingPanel" type="popup"/>
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingDetail.xml b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingDetail.xml
index bd366d0..7b68b94 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingDetail.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingDetail.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing" default-menu-index="1" default-menu-include="false">
+        default-menu-title="${orderRouting?orderRouting.routingName:''} :${orderRoutingId}" default-menu-index="1" default-menu-include="false">
 
     <parameter name="orderRoutingId" required="true"/>
-
     <transition name="orderRoutingGroup">
         <default-response url="../../OrderRoutingGroupDetail"/>
     </transition>
@@ -43,8 +42,13 @@
     </transition>
     <transition name="routingRunList"><default-response url="../../../OrderRoutingRuns/OrderRoutingRunList"/></transition>
 
-    <actions>
+    <pre-actions>
         <entity-find-one entity-name="co.hotwax.order.routing.OrderRouting" value-field="orderRouting"/>
+    </pre-actions>
+    <actions>
+        <if condition="!orderRouting || !orderRoutingId">
+            <return message="No order routing found for ID ${orderRoutingId}" error="true"/>
+        </if>
         <entity-find-one entity-name="co.hotwax.order.routing.OrderRoutingGroup" value-field="orderRoutingGroup">
             <field-map field-name="routingGroupId" from="orderRouting.routingGroupId"/>
         </entity-find-one>
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingRuleDetail.xml b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingRuleDetail.xml
index aa09ff8..7d57279 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingRuleDetail.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRouting/OrderRoutingRuleDetail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing Rule" default-menu-index="1" default-menu-include="false">
+        default-menu-title="Routing rule" default-menu-index="1" default-menu-include="false">
 
     <parameter name="routingRuleId" required="true"/>
 
@@ -36,9 +36,13 @@
         <service-call name="update#co.hotwax.order.routing.OrderRoutingRule"/>
         <default-response url="."/>
     </transition>
-
-    <actions>
+    <pre-actions>
         <entity-find-one entity-name="co.hotwax.order.routing.OrderRoutingRule" value-field="orderRoutingRule"/>
+    </pre-actions>
+    <actions>
+        <if condition="!orderRoutingRule || !routingRuleId">
+            <return message="No order routing group found for ID ${routingRuleId}" error="true"/>
+        </if>
         <entity-find-one entity-name="co.hotwax.order.routing.OrderRouting" value-field="orderRouting">
             <field-map field-name="orderRoutingId" from="orderRoutingRule.orderRoutingId"/>
         </entity-find-one>
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupDetail.xml b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupDetail.xml
index 1520e7c..c6f9850 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupDetail.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupDetail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing Group" default-menu-index="1" default-menu-include="false">
+        default-menu-title="${orderRoutingGroup?orderRoutingGroup.groupName:''} : ${routingGroupId}" default-menu-index="1" default-menu-include="false">
 
     <parameter name="routingGroupId" required="true"/>
     <transition name="OrderRoutingGroupRuns"><default-response url="../../OrderRoutingGroupRuns/OrderRoutingGroupRunList"/></transition>
@@ -36,8 +36,13 @@
         <service-call name="co.hotwax.order.routing.CommonServices.delete#OrderRouting"/>
         <default-response url="."/>
     </transition>
-    <actions>
+    <pre-actions>
         <entity-find-one entity-name="co.hotwax.order.routing.OrderRoutingGroup" value-field="orderRoutingGroup"/>
+    </pre-actions>
+    <actions>
+        <if condition="!orderRoutingGroup || !routingGroupId">
+            <return message="No order routing group found for ID ${routingGroupId}" error="true"/>
+        </if>
         <entity-find-one entity-name="moqui.service.job.ServiceJobRunLock" value-field="runLock">
             <field-map field-name="jobName" from="orderRoutingGroup.jobName"/>
         </entity-find-one>
diff --git a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupList.xml b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupList.xml
index fe18def..d32b336 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupList.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroups/OrderRoutingGroupList.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing Groups" default-menu-index="1">
+        default-menu-title="Routing Groups" default-menu-index="1">
 
     <transition name="orderRoutingGroup"><default-response url="../OrderRoutingGroupDetail"/></transition>
     <transition name="createOrderRoutingGroup">
diff --git a/screen/OrderRoutingGroup/OrderRoutingRuns.xml b/screen/OrderRoutingGroup/OrderRoutingRuns.xml
index 6f9af4a..8b3a0ce 100644
--- a/screen/OrderRoutingGroup/OrderRoutingRuns.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingRuns.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing Runs" default-menu-index="3">
+        default-menu-title="Routing Runs" default-menu-index="3">
 
     <subscreens default-item="OrderRoutingRunList"/>
     <widgets>
diff --git a/screen/OrderRoutingGroup/OrderRoutingRuns/OrderRoutingRunList.xml b/screen/OrderRoutingGroup/OrderRoutingRuns/OrderRoutingRunList.xml
index 269e7f4..f4eb4ce 100644
--- a/screen/OrderRoutingGroup/OrderRoutingRuns/OrderRoutingRunList.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingRuns/OrderRoutingRunList.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
-        default-menu-title="Order Routing Groups" default-menu-include="false">
+        default-menu-title="Routing Runs" default-menu-include="false">
 
     <parameter name="routingGroupId"/>
     <parameter name="orderRoutingId"/>
diff --git a/service/co/hotwax/order/routing/OrderRoutingServices.xml b/service/co/hotwax/order/routing/OrderRoutingServices.xml
index d6b4a1d..19a9789 100644
--- a/service/co/hotwax/order/routing/OrderRoutingServices.xml
+++ b/service/co/hotwax/order/routing/OrderRoutingServices.xml
@@ -463,7 +463,7 @@
 
                     facilityAllocation = [];
                     def comments='';
-                    def routingRuleName = "${orderRoutingGroup.groupName} [${orderRoutingGroup.routingGroupId}] : ${orderRouting.routingName} [${orderRouting.orderRoutingId}] : ${routingRule.ruleName} [${routingRule.routingRuleId}]"
+                    def routingRuleName = "${orderRoutingGroup.groupName} : ${orderRouting.routingName} : ${routingRule.ruleName}]"
                     def suggestedFacilityIds = suggestedFulfillmentLocations.facilityId as Set
                     if (!routingRule.assignmentEnumId || 'ORA_SINGLE'.equals(routingRule.assignmentEnumId)) {
                         // SQL will not return results if items are not available at a single location.