diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index dad6a8d4..da68cf5a 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -277,13 +277,13 @@ class JobOrderController extends Controller
                 $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]);
                 $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]);
                 // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]);
-                $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]);
+                $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params), ['id' => $jo_id]);
                 $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
             }
             else
             {
                 // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]);
-                $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id), ['id' => $jo_id]);
+                $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params), ['id' => $jo_id]);
                 $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
                 $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]);
             }
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 12995e56..9372b8a5 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -2588,7 +2588,32 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         }
     }
 
-    public function getEditRoute()
+    public function getEditRoute($jo_id, $tier)
     {
+        $edit_route = '';
+
+        if (empty($tier))
+            return $edit_route;
+
+        switch ($tier)
+        {
+            case 'proc':
+                $edit_route = 'jo_proc_form';
+                break;
+            case 'assign':
+                $edit_route = 'jo_assign_form';
+                break;
+            case 'fulfill':
+                $edit_route = 'jo_fulfill_form';
+                break;
+            case 'all':
+                $edit_route = 'jo_all_form';
+                break;
+            default:
+                // do nothing
+                // for 'open', edit route is blank
+        } 
+
+        return $edit_route;
     }
 }