diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 9388de32..1d1d84c1 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, $tier_params), ['id' => $jo_id]);
+                $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['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, $tier_params), ['id' => $jo_id]);
+                $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['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 9372b8a5..e98eaa45 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -2590,30 +2590,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
 
     public function getEditRoute($jo_id, $tier)
     {
-        $edit_route = '';
-
         if (empty($tier))
-            return $edit_route;
+            return 'jo_open_edit_form';
 
-        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;
+        return $tier;
     }
 }
diff --git a/templates/job-order/list.fulfillment.html.twig b/templates/job-order/list.fulfillment.html.twig
index 8115866d..66d3c837 100644
--- a/templates/job-order/list.fulfillment.html.twig
+++ b/templates/job-order/list.fulfillment.html.twig
@@ -135,7 +135,7 @@
                     sortable: false,
                     overflow: 'visible',
                     template: function (row, index, datatable) {
-                        var actions = '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View / Edit"><i class="la la-edit"></i></a>' + '<a href="' + row.meta.onestep_edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="One Step Edit"><i class="la la-edit"></i></a>';
+                        var actions = '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View / Edit"><i class="la la-edit"></i></a>';
 							
                         return actions;
                     },
diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig
index 451d8492..3a407009 100644
--- a/templates/job-order/list.open.html.twig
+++ b/templates/job-order/list.open.html.twig
@@ -148,9 +148,6 @@
                         {% if is_granted('jo_open.edit') %}
                             actions += '<a href="' + row.meta.edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="Edit"><i class="fa fa-file"></i></a>';
                         {% endif %}
-                        {% if is_granted('jo_onestep.edit') %}
-                            actions += '<a href="' + row.meta.onestep_edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="One Step Edit"><i class="fa fa-file"></i></a>';
-                        {% endif %}
 							
                         return actions;
                     },