diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index baf8e510a..47e629b03 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -660,7 +660,7 @@
         "render": "35,35,center"
       },
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/bike_cleaning/bike_cleaning.json b/assets/layers/bike_cleaning/bike_cleaning.json
index 8fade5020..f86e99058 100644
--- a/assets/layers/bike_cleaning/bike_cleaning.json
+++ b/assets/layers/bike_cleaning/bike_cleaning.json
@@ -160,7 +160,7 @@
       ],
       "iconSize": "50,50,bottom",
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json
index 83117e915..5c677264d 100644
--- a/assets/layers/birdhide/birdhide.json
+++ b/assets/layers/birdhide/birdhide.json
@@ -307,7 +307,7 @@
         ]
       },
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json
index d46750550..de6f5d2d5 100644
--- a/assets/layers/cafe_pub/cafe_pub.json
+++ b/assets/layers/cafe_pub/cafe_pub.json
@@ -206,7 +206,7 @@
         ]
       },
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 87b7cb1ab..ff52d6dac 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -183,7 +183,7 @@
       ],
       "iconSize": "40,40,bottom",
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json
index 8e255b83d..9ee4a5ea9 100644
--- a/assets/layers/ghost_bike/ghost_bike.json
+++ b/assets/layers/ghost_bike/ghost_bike.json
@@ -205,7 +205,7 @@
       "icon": "./assets/layers/ghost_bike/ghost_bike.svg",
       "iconSize": "40,40,bottom",
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/gps_location/gps_location.json b/assets/layers/gps_location/gps_location.json
index 2ca49a5c2..b4d330f80 100644
--- a/assets/layers/gps_location/gps_location.json
+++ b/assets/layers/gps_location/gps_location.json
@@ -10,7 +10,7 @@
     {
       "icon": "crosshair:#00f",
       "iconSize": "40,40,center",
-      "location": "point"
+      "location": ["point","centroid"]
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/layers/gps_track/gps_track.json b/assets/layers/gps_track/gps_track.json
index 08a3260b0..c27fa667f 100644
--- a/assets/layers/gps_track/gps_track.json
+++ b/assets/layers/gps_track/gps_track.json
@@ -20,11 +20,6 @@
   ],
   "name": "Your track",
   "mapRendering": [
-    {
-      "icon": "circle:#f00",
-      "iconSize": "2,2,center",
-      "location": "point"
-    },
     {
       "width": 3,
       "color": "#bb000077"
diff --git a/assets/layers/home_location/home_location.json b/assets/layers/home_location/home_location.json
index b70874976..c4dc31c0f 100644
--- a/assets/layers/home_location/home_location.json
+++ b/assets/layers/home_location/home_location.json
@@ -14,7 +14,7 @@
       "iconSize": {
         "render": "20,20,center"
       },
-      "location": "point"
+      "location": ["point","centroid"]
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json
index b0ada5b1c..55c9dbf10 100644
--- a/assets/layers/picnic_table/picnic_table.json
+++ b/assets/layers/picnic_table/picnic_table.json
@@ -115,7 +115,7 @@
         "render": "35,35,center"
       },
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/street_lamps/street_lamps.json b/assets/layers/street_lamps/street_lamps.json
index c7884fce6..4924e0d75 100644
--- a/assets/layers/street_lamps/street_lamps.json
+++ b/assets/layers/street_lamps/street_lamps.json
@@ -25,7 +25,7 @@
   },
   "mapRendering": [
     {
-      "location": "point",
+      "location": ["point","centroid"],
       "icon": "./assets/layers/street_lamps/street_lamp.svg",
       "iconBadges": [
         {
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 4e15272ff..6847c801f 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -575,7 +575,7 @@
         }
       ],
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index d58972b87..38c9473da 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -616,7 +616,7 @@
         "render": "40,40,bottom"
       },
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/type_node/type_node.json b/assets/layers/type_node/type_node.json
index e7e3ba5f4..4609041ed 100644
--- a/assets/layers/type_node/type_node.json
+++ b/assets/layers/type_node/type_node.json
@@ -5,7 +5,7 @@
   "source": {
     "osmTags": "id~node/.*"
   },
-  "mapRendering": [],
+  "mapRendering": null,
   "name": "All OSM Nodes",
   "title": "OSM node {id}",
   "tagRendering": []
diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json
index b968d2ce0..6f90b3d0f 100644
--- a/assets/layers/visitor_information_centre/visitor_information_centre.json
+++ b/assets/layers/visitor_information_centre/visitor_information_centre.json
@@ -69,7 +69,7 @@
         "render": "40,40,center"
       },
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json
index 5c55c8e76..8f04d69da 100644
--- a/assets/layers/watermill/watermill.json
+++ b/assets/layers/watermill/watermill.json
@@ -172,7 +172,7 @@
         "render": "50,50,center"
       },
       "location": [
-        "point"
+        "point","centroid"
       ]
     }
   ]
diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json
index 5751a5575..8a14c1eb9 100644
--- a/assets/themes/facadegardens/facadegardens.json
+++ b/assets/themes/facadegardens/facadegardens.json
@@ -455,7 +455,7 @@
             "render": "50,50,center"
           },
           "location": [
-            "point"
+            "point","centroid"
           ]
         }
       ]
diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json
index 2d487ab3d..0d6bd41bf 100644
--- a/assets/themes/grb_import/grb.json
+++ b/assets/themes/grb_import/grb.json
@@ -396,7 +396,8 @@
       "mapRendering": [
         {
           "location": [
-            "point"
+            "point",
+            "centroid"
           ],
           "icon": "circle:#bb3322",
           "iconSize": "15,15,center"
diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json
index 9d52caa8b..78d60c7b0 100644
--- a/assets/themes/hailhydrant/hailhydrant.json
+++ b/assets/themes/hailhydrant/hailhydrant.json
@@ -506,7 +506,7 @@
             "render": "20,20,center"
           },
           "location": [
-            "point"
+            "point","centroid"
           ]
         }
       ]
diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json
index 4f9599516..5f9163add 100644
--- a/assets/themes/openwindpowermap/openwindpowermap.json
+++ b/assets/themes/openwindpowermap/openwindpowermap.json
@@ -272,7 +272,7 @@
           },
           "iconSize": "40, 40, bottom",
           "location": [
-            "point"
+            "point","centroid"
           ]
         }
       ]
diff --git a/assets/themes/street_lighting/street_lighting_assen.json b/assets/themes/street_lighting/street_lighting_assen.json
index 695347f42..e6d8eb3ad 100644
--- a/assets/themes/street_lighting/street_lighting_assen.json
+++ b/assets/themes/street_lighting/street_lighting_assen.json
@@ -36,7 +36,7 @@
       "title": "Straatlantaarn in dataset",
       "mapRendering": [
         {
-          "location": "point",
+          "location": ["point","centroid"],
           "icon": {
             "render": "circle:red",
             "mappings": [
diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json
index 2a2d0b5f1..fa3df18b5 100644
--- a/assets/themes/uk_addresses/uk_addresses.json
+++ b/assets/themes/uk_addresses/uk_addresses.json
@@ -79,7 +79,7 @@
           }
         }
       ],
-      "mapRendering": []
+      "mapRendering": null
     },
     {
       "id": "to_import",
@@ -180,7 +180,7 @@
             "render": "40,40,center"
           },
           "location": [
-            "point"
+            "point","centroid"
           ]
         }
       ],