diff --git a/templates/job-order/cmb.form.html.twig b/templates/job-order/cmb.form.html.twig
index c0dc49eb..3e193e24 100644
--- a/templates/job-order/cmb.form.html.twig
+++ b/templates/job-order/cmb.form.html.twig
@@ -906,17 +906,6 @@
 
 <script>
 
-{% if 'OpenStreet' in map_js_file %}
-    initMap();
-{% endif %}
-
-function initMap() {
-    var default_lat = {% trans %}default_lat{% endtrans %};
-    var default_lng = {% trans %}default_long{% endtrans %};
-
-    var map = mapCreate('m_gmap', default_lat, default_lng, 'road', 13);
-}
-
 // location search autocomplete
 var input = document.getElementById('m_gmap_address');
 
@@ -942,6 +931,34 @@ autocomplete.addListener('place_changed', function() {
 $(function() {
     var form_in_process = false;
 
+    // openstreet maps stuff
+    var default_lat = {% trans %}default_lat{% endtrans %};
+    var default_lng = {% trans %}default_long{% endtrans %};
+
+    var map = mapCreate('m_gmap', default_lat, default_lng, 'road', 13);
+
+    var markerLayerGroup = L.layerGroup().addTo(map);
+
+    function selectPoint(lat, lng)
+    {
+        // clear markers
+        markerLayerGroup.clearLayers();
+
+        //var lat = latlng.lat;
+        //var lng = latlng.lng;
+
+        var marker = L.marker([lat, lng]);
+
+        // add marker to layer group
+        markerLayerGroup.addLayer(marker);
+
+        map.setView(new L.LatLng(lat, lng), 13);
+    }
+
+    map.on('click', function(e) {
+        selectPoint(e.latlng.lat, e.latlng.lng);
+    });
+
 	// BEGIN google maps stuff
         /*
 	function selectPoint(map, latlng) {
@@ -979,9 +996,13 @@ $(function() {
 	    GMaps.geocode({
 	        address: text,
 	        callback: function(results, status) {
-	            map.removeMarkers();
+                    markerLayerGroup.clearLayers();
 	            if (status == 'OK') {
-	                selectPoint(map, results[0].geometry.location);
+	                // selectPoint(map, results[0].geometry.location);
+                        console.log(results);
+                        var lat = results[0].geometry.location.lat();
+                        var lng = results[0].geometry.location.lng();
+                        selectPoint(lat, lng);
 	            }
 	        },
 	        region: 'ph'
diff --git a/templates/map/initOpenStreetMap.js b/templates/map/initOpenStreetMap.js
index 3fd3f43c..5f51866b 100644
--- a/templates/map/initOpenStreetMap.js
+++ b/templates/map/initOpenStreetMap.js
@@ -54,6 +54,8 @@ function mapCreate(div_id, center_lat, center_lng, map_type, zoom) {
     }
     
     L.control.layers(baseMaps, overlayMaps).addTo(map);
+
+    return map;
 }
 
 </script>
diff --git a/templates/map/joOpenStreetMap.js b/templates/map/joOpenStreetMap.js
index 93ab20a6..5a50d5c3 100644
--- a/templates/map/joOpenStreetMap.js
+++ b/templates/map/joOpenStreetMap.js
@@ -18,6 +18,8 @@ function mapCreate(div_id, center_lat, center_lng, map_type, zoom) {
         id: 'mapbox/streets-v11',
         accessToken: 'pk.eyJ1Ijoia2NvcmRlcm8iLCJhIjoiY2szbzA3ZHdsMDZxdTNsbGl4ZGNnN2VxaSJ9.LRzAe3RlV8sIP1N1x0chdw'
     }).addTo(map);
+
+    return map;
 }
 
 </script>