diff --git a/templates/job-order/form.onestep.html.twig b/templates/job-order/form.onestep.html.twig
index 84bc8eac..4bef4efb 100644
--- a/templates/job-order/form.onestep.html.twig
+++ b/templates/job-order/form.onestep.html.twig
@@ -640,25 +640,40 @@ $(function() {
 
         var marker = L.marker([lat, lng], { icon: icon_customer });
 
-        // get nearest hubs ajax
-        var hub_table = '';
-        $.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
-            var hubs = data['hubs'];
-            for (i in hubs) {
-                var hub = hubs[i];
-                var hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub });
-                hubLayerGroup.addLayer(hub_marker);
+        {% if mode in ['onestep'] %}
+            // get nearest hubs ajax
+            var hub_table = '';
+            $.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
+                var hubs = data['hubs'];
+                for (i in hubs) {
+                    var hub = hubs[i];
+                    var hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub });
+                    hubLayerGroup.addLayer(hub_marker);
 
-                hub_table += '<tr data-id=' + hub['id'] + '>';
-                hub_table += '<td>' + hub['name'] + '</td>';
-                hub_table += '<td>' + hub['branch'] + '</td>';
-                hub_table += '<td>' + hub['cnum'] + '</td>';
-                hub_table += '<td></td>';
-                hub_table += '</tr>';
-            }
+                    hub_table += '<tr data-id=' + hub['id'] + '>';
+                    hub_table += '<td>' + hub['name'] + '</td>';
+                    hub_table += '<td>' + hub['branch'] + '</td>';
+                    hub_table += '<td>' + hub['cnum'] + '</td>';
+                    hub_table += '<td></td>';
+                    hub_table += '</tr>';
+                }
 
-            $('#nearest_hubs').html(hub_table);
-        });
+                $('#nearest_hubs').html(hub_table);
+
+            });
+        {% endif %}
+
+        {% if mode in ['onestep-edit'] %}
+            // get nearest hubs ajax
+            $.getJSON("{{ url('hub_nearest') }}?lat=" + lat + "&long=" + lng, function(data) {
+                var hubs = data['hubs'];
+                for (i in hubs) {
+                    var hub = hubs[i];
+                    var hub_marker = L.marker([hub['lat'], hub['long']], { icon: icon_hub });
+                    hubLayerGroup.addLayer(hub_marker);
+                }
+            });
+        {% endif %}
 
         // add marker to layer group
         markerLayerGroup.addLayer(marker);
@@ -723,7 +738,13 @@ $(function() {
 	});
 
     $(function() {
-        var selected_hub = ""; 
+        {% if mode in ['onestep-edit'] %}
+            var selected_hub = '{{ obj.getHub ? obj.getHub.getID: "" }}';
+            $('#hub-field').val(selected_hub);
+        {% endif %}
+        {% if mode in ['onestep'] %}
+            var selected_hub = '';
+        {% endif %}
         $('#hubs-table').on('click', 'tr', function() {
             var id = $(this).data('id');
 
@@ -775,7 +796,13 @@ $(function() {
     });
 
     $(function() {
-        var selected_rider = '';
+        {% if mode in ['onestep-edit'] %}
+            var selected_rider = '{{ obj.getRider ? obj.getRider.getID: "" }}';
+            $('#rider-field').val(selected_rider);
+        {% endif %}
+        {% if mode in ['onestep'] %}
+            var selected_rider = '';
+        {% endif %}
         $('#rider-table').on('click', 'tr', function() {
             var id = $(this).data('id');