diff --git a/public/static/js/map_editor.js b/public/static/js/map_editor.js
index 494ee00..ef1108c 100644
--- a/public/static/js/map_editor.js
+++ b/public/static/js/map_editor.js
@@ -291,6 +291,11 @@
 
                 MapEditor.replacePlaceIdsToReal(this.response.added);
 
+                if (mapId === 0) {
+                    mapId = this.response.mapId;
+                    window.history.replaceState(null, '', '/admin/mapEditor/' + mapId);
+                }
+
                 MapEditor.added = {};
                 MapEditor.edited = {};
                 MapEditor.deleted = {};
@@ -370,7 +375,7 @@
         ppi: highResData.ppi,
         tileSize: highResData.tileSize,
         zoomOffset: highResData.zoomOffset,
-        minZoom: 0,
+        minZoom: 2,
         maxZoom: 20
     }).addTo(MapEditor.map);
 
diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index cb776df..7f65a5f 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -62,9 +62,9 @@
 </div>
 <script>
     var tileUrl = '<?= $_ENV['LEAFLET_TILESERVER_URL'] ?>';
-    var mapId = '<?= $mapId ?>';
+    var mapId = <?= $mapId ?>;
     var mapBounds = <?= json_encode($bounds) ?>;
-    var places = <?= json_encode($places) ?>;
+    var places = <?= json_encode($places, JSON_FORCE_OBJECT) ?>;
 </script>
 <script src="/static/node_modules/leaflet/dist/leaflet.js"></script>
 <script src="https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>"></script>