diff --git a/src/js/_components/drivers/_map.google.js b/src/js/_components/drivers/_map.google.js
index 7f6e011..d5be85d 100755
--- a/src/js/_components/drivers/_map.google.js
+++ b/src/js/_components/drivers/_map.google.js
@@ -4,7 +4,7 @@ import $ from 'jquery';
 import Events from '../../_events';
 import MarkerUI from './_map.google.marker';
 
-const GoogleMapsDriver = (($) => {
+const GoogleMapsDriver = ($ => {
   class GoogleMapsDriver {
     getName() {
       return 'GoogleMapsDriver';
@@ -39,13 +39,13 @@ const GoogleMapsDriver = (($) => {
       const zoom = config['mapZoom'] ? config['mapZoom'] : 10;
       const center = config['center']
         ? {
-          lat: config['center'][1],
-          lng: config['center'][0],
-        }
+            lat: config['center'][1],
+            lng: config['center'][0],
+          }
         : {
-          lat: 0,
-          lng: 0,
-        };
+            lat: 0,
+            lng: 0,
+          };
       const style = config['style'] ? config['style'] : null;
 
       console.log(`${ui.getName()}: API is loaded`);
@@ -111,7 +111,9 @@ const GoogleMapsDriver = (($) => {
 
       if (ui.config['flyToMarker']) {
         ui.map.setCenter(pos); // panTo
-        ui.map.setZoom(18);
+        if (!ui.config['noZoom']) {
+          ui.map.setZoom(18);
+        }
       }
 
       // keep it hidden to render content
@@ -122,7 +124,7 @@ const GoogleMapsDriver = (($) => {
 
       $popup.find('.mapboxgl-popup-content .html').html(content);
 
-      $popup.find('.mapboxgl-popup-close-button').on('click', (e) => {
+      $popup.find('.mapboxgl-popup-close-button').on('click', e => {
         e.preventDefault();
         ui.hidePopup();
       });
@@ -142,7 +144,7 @@ const GoogleMapsDriver = (($) => {
       const $popup = $(ui.popup.getDiv());
 
       $popup.addClass('d-none');
-      if (!ui.config['noRestoreBounds']) {
+      if (!ui.config['noRestoreBounds'] || ui.config['flyToBounds']) {
         ui.restoreBounds();
       }
 
@@ -207,7 +209,7 @@ const GoogleMapsDriver = (($) => {
       const bounds = new google.maps.LatLngBounds();
 
       // add markers to map
-      config['geojson'].features.forEach((marker) => {
+      config['geojson'].features.forEach(marker => {
         const id = marker.id;
         const crds = marker.geometry.coordinates;
         const content = marker.properties.content;