diff --git a/config/services.yaml b/config/services.yaml
index 490a8f80..bd81dd79 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -87,9 +87,9 @@ services:
             $password: "%env(REDIS_CLIENT_PASSWORD)%"
             $env_flag: "dev"
 
-    App\Service\GoogleMapManager: ~
+    App\Service\BingMapManager: ~
 
-    App\Service\MapManagerInterface: "@App\\Service\\GoogleMapManager"
+    App\Service\MapManagerInterface: "@App\\Service\\BingMapManager"
 
     Catalyst\APIBundle\Security\APIKeyUserProvider:
         arguments:
diff --git a/templates/job-order/bingmaps.js.twig b/templates/job-order/bingmaps.js.twig
index 7c191cd3..0630e96e 100644
--- a/templates/job-order/bingmaps.js.twig
+++ b/templates/job-order/bingmaps.js.twig
@@ -1,14 +1,18 @@
 <script type='text/javascript' src='http://www.bing.com/api/maps/mapcontrol?callback=GetMap&key={{ bingmaps_api_key|raw }}' async defer></script>
 <script>
 
-$(function() {
-    var form_in_process = false;
-    var searchManager;
-    var pin;
-    var map = new Microsoft.Maps.Map('#m_gmap', {
+var form_in_process = false;
+var searchManager;
+var pin;
+var map;
+
+function GetMap()
+{
+    map = new Microsoft.Maps.Map('#m_gmap', {
         center: new Microsoft.Maps.Location(14.6091, 121.0223),
-        culture: 'fil-Latn';
-    };
+        culture: 'fil-Latn'
+    });
+
     Microsoft.Maps.Events.addHandler(map, 'click', selectPoint);
 
     function selectPoint(e) {
@@ -27,18 +31,21 @@ $(function() {
 
             map.entities.push(pin);
             map.setCenter(location);
-
+            
             // set value in hidden input
             $('#map_lat').val(locTemp.latitude);
             $('#map_lng').val(locTemp.longitude);
         }
-
+        
         map.setCenter(lat, lng);
-
+        
         // set value in hidden input
         $('#map_lat').val(lat);
         $('#map_lng').val(lng);
     }
+}
+
+$(function() {
 
     function geocodeQuery(query) {
         var searchRequest = {
@@ -133,15 +140,11 @@ $(function() {
             var hub_dest = new Microsoft.Maps.Location({{ hub.hub.getCoordinates.getLatitude }},
                 {{ hub.hub.getCoordinates.getLongitude }});
             hmap.entities.push(new Microsoft.Maps.Pushpin(hub_dest, {
+                title: "{{ hub.hub.getName }}",
+                text: "{{ hub.hub.getName }}",
+                icon: '/assets/images/icon-outlet.png'
                 })
             );
-            hmap.addMarker({
-                lat: {{ hub.hub.getCoordinates.getLatitude }},
-                lng: {{ hub.hub.getCoordinates.getLongitude }},
-                title: "{{ hub.hub.getName }}",
-                content: "{{ hub.hub.getName }}",
-                        icon: '/assets/images/icon-outlet.png'
-            });
         {% endfor %}
 
     {% endif %}