diff --git a/public/js/client_rmld.js b/public/js/client_rmld.js
index 29f9d79..fa688a4 100755
--- a/public/js/client_rmld.js
+++ b/public/js/client_rmld.js
@@ -36,8 +36,9 @@ map.removeLayer(marker);
 marker = L.marker(new L.LatLng(einsatzdaten_obj.wgs84_x, einsatzdaten_obj.wgs84_y), {
   icon: redIcon
 }).addTo(map);
-L.geoJSON(einsatzdaten_obj.wgs84_area).addTo(map);
+L.geoJSON(JSON.parse(einsatzdaten_obj.wgs84_area)).addTo(map);
 map.setView(new L.LatLng(einsatzdaten_obj.wgs84_x, einsatzdaten_obj.wgs84_y), 13);
+map.fitBounds(poly.getBounds(JSON.parse(einsatzdaten_obj.wgs84_area)));
 
 
 /* ########################### */
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 77b8247..e989bfc 100755
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -45,12 +45,14 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     };
     // Polygon erzeugen und zuweisen falls nicht vorhanden
     if (!content.ortsdaten.wgs84_area) {
-      var point = turf.point([content.ortsdaten.wgs84_x, content.ortsdaten.wgs84_y]);
-      var buffered = turf.buffer(point, 1);
+      var wgs_x = parseFloat(content.ortsdaten.wgs84_x);
+      var wgs_y = parseFloat(content.ortsdaten.wgs84_y);
+      var point = turf.point([wgs_y, wgs_x]);
+      var buffered = turf.buffer(point, 1, {steps: 5, units: 'kilometers'});
       var bbox = turf.bbox(buffered);
       var new_point = turf.randomPoint(1, {bbox: bbox});
-      var new_buffer = turf.buffer(new_point, 1, {units: 'kilometers', steps: 6})
-      content.ortsdaten.wgs84_area = JSON.stringify(buffered);
+      var new_buffer = turf.buffer(new_point, 1, {steps: 5, units: 'kilometers'})
+      content.ortsdaten.wgs84_area = JSON.stringify(new_buffer);
     };