diff --git a/addressing.mss b/addressing.mss
index 1b3f8cd54d..d4f13ee3e1 100644
--- a/addressing.mss
+++ b/addressing.mss
@@ -25,7 +25,6 @@
         }
       }
     }
-    text-placement: interior;
     text-face-name: @book-fonts;
     text-fill: @address-color;
     text-halo-radius: @standard-halo-radius;
@@ -56,7 +55,6 @@ no official postal addresses) */
   [zoom >= 14][way_pixels > 3000],
   [zoom >= 17] {
     text-name: "[name]";
-    text-placement: interior;
     text-face-name: @book-fonts;
     text-fill: #444;
     text-halo-radius: @standard-halo-radius;
diff --git a/amenity-points.mss b/amenity-points.mss
index 3a02357a2f..87f0dc2f00 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -48,42 +48,36 @@
       marker-file: url('symbols/alpinehut.svg');
     }
     marker-fill: @accommodation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_atm'][zoom >= 17] {
     marker-file: url('symbols/atm.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bank'][zoom >= 17] {
     marker-file: url('symbols/bank.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bar'][zoom >= 17] {
     marker-file: url('symbols/bar.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bbq'][zoom >= 17] {
     marker-file: url('symbols/bbq.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bicycle_rental'][zoom >= 17] {
     marker-file: url('symbols/rental_bicycle.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -91,7 +85,6 @@
     [zoom >= 16] {
       marker-file: url('symbols/square.svg');
       marker-fill: @transportation-icon;
-      marker-placement: interior;
       marker-width: 6;
       marker-clip: false;
     }
@@ -106,56 +99,48 @@
     [access = 'yes'] {
       marker-file: url('symbols/elevator.12.svg');
       marker-fill: @transportation-icon;
-      marker-placement: interior;
     }
   }
 
   [feature = 'amenity_bus_station'][zoom >= 16] {
     marker-file: url('symbols/bus_station.svg');
     // use colors from SVG to allow for white background
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_taxi'][zoom >= 17] {
     marker-file: url('symbols/taxi.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'highway_traffic_signals'][zoom >= 17] {
     marker-file: url('symbols/traffic_light.13.svg');
     marker-fill: #545454;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'barrier_toll_booth'][zoom >= 16] {
     marker-file: url('symbols/toll_booth.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_cafe'][zoom >= 17] {
     marker-file: url('symbols/cafe.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_artwork'][zoom >= 17] {
     marker-file: url('symbols/artwork.svg');
     marker-fill: @memorials;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_camp_site'][zoom >= 16] {
     marker-file: url('symbols/camping.svg');
     marker-fill: @accommodation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -163,13 +148,11 @@
   [feature = 'highway_ford'][zoom >= 16] {
     marker-file: url('symbols/ford.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_caravan_site'][zoom >= 16] {
     marker-file: url('symbols/caravan_park.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @accommodation-icon;
   }
@@ -177,49 +160,42 @@
   [feature = 'amenity_car_rental'][zoom >= 17] {
     marker-file: url('symbols/rental_car.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_car_wash'][zoom >= 17] {
     marker-file: url('symbols/car_wash.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_chalet'][zoom >= 17] {
     marker-file: url('symbols/chalet.svg');
     marker-fill: @accommodation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_cinema'][zoom >= 16] {
     marker-file: url('symbols/cinema.svg');
     marker-fill: @culture;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_public_bath'][zoom >= 17] {
     marker-file: url('symbols/public_bath.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_nightclub'][zoom >= 17] {
     marker-file: url('symbols/nightclub.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fire_station'][zoom >= 16] {
     marker-file: url('symbols/firestation.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -244,7 +220,6 @@
       [zoom >= 18] {
         nozzle/marker-file: url('symbols/fountain.svg');
         nozzle/marker-fill: @marina-text;
-        nozzle/marker-placement: interior;
         nozzle/marker-clip: false;
       }
     }
@@ -253,55 +228,47 @@
   [feature = 'amenity_charging_station'][zoom >= 17] {
     marker-file: url('symbols/charging_station.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fuel'][zoom >= 17] {
     marker-file: url('symbols/fuel.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_guest_house'][zoom >= 17] {
     marker-file: url('symbols/guest_house.svg');
     marker-fill: @accommodation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_apartment'][zoom >= 18] {
     marker-file: url('symbols/apartment.svg');
     marker-fill: @accommodation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_hospital'][zoom >= 15] {
     marker-file: url('symbols/hospital.svg');
     marker-fill: @health-color;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_hostel'][zoom >= 17] {
     marker-file: url('symbols/hostel.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @accommodation-icon;
   }
 
   [feature = 'tourism_hotel'][zoom >= 17] {
     marker-file: url('symbols/hotel.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @accommodation-icon;
   }
 
   [feature = 'tourism_motel'][zoom >= 17] {
     marker-file: url('symbols/motel.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @accommodation-icon;
   }
@@ -309,13 +276,11 @@
   [feature = 'amenity_ice_cream'][zoom >= 17] {
     marker-file: url('symbols/shop/ice_cream.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_information'][zoom >= 17] {
     marker-file: url('symbols/information.12.svg');
-    marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
@@ -323,20 +288,17 @@
   [feature = 'amenity_embassy'][zoom >= 17] {
     marker-file: url('symbols/embassy.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_library'][zoom >= 16] {
     marker-file: url('symbols/library.svg');
     marker-fill: @culture;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_courthouse'][zoom >= 16] {
     marker-file: url('symbols/courthouse.svg');
-    marker-placement: interior;
     marker-fill: @public-service;
     marker-clip: false;
   }
@@ -344,28 +306,24 @@
   [feature = 'amenity_community_centre'][zoom >= 17] {
     marker-file: url('symbols/community_centre.svg');
     marker-fill: @culture;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_shower'][zoom >= 18] {
     marker-file: url('symbols/shower.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_social_facility'][zoom >= 17] {
     marker-file: url('symbols/social_facility.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_townhall'][zoom >= 16] {
     marker-file: url('symbols/town_hall.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -377,13 +335,11 @@
       ["tower:type" != 'lighting'] {
         marker-file: url('symbols/towers/mast.svg');
         marker-fill: @man-made-icon;
-        marker-placement: interior;
         marker-clip: false;
       }
       ["tower:type" = 'lighting'][zoom >= 18] {
         marker-file: url('symbols/towers/mast_lighting.svg');
         marker-fill: @man-made-icon;
-        marker-placement: interior;
         marker-clip: false;
       }
       ["tower:type" = 'communication'] {
@@ -401,7 +357,6 @@
     [zoom >= 17] {
       marker-file: url('symbols/towers/tower_generic.svg');
       marker-fill: @man-made-icon;
-      marker-placement: interior;
       marker-clip: false;
       ["tower:type" = 'defensive'] {
         marker-file: url('symbols/towers/tower_defensive.svg');
@@ -433,7 +388,6 @@
   [feature = 'tourism_museum'][zoom >= 16] {
     marker-file: url('symbols/museum.svg');
     marker-fill: @culture;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -449,7 +403,6 @@
     [feature = 'amenity_motorcycle_parking'] {
       marker-file: url('symbols/motorcycle_parking.svg');
     }
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @transportation-icon;
     [access != ''][access != 'permissive'][access != 'yes'] {
@@ -460,7 +413,6 @@
   [feature = 'amenity_pharmacy'][zoom >= 17] {
     marker-file: url('symbols/pharmacy.svg');
     marker-fill: @health-color;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -468,28 +420,24 @@
   [feature = 'amenity_doctors'][zoom >= 17] {
     marker-file: url('symbols/doctors.svg');
     marker-fill: @health-color;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_dentist'][zoom >= 17] {
     marker-file: url('symbols/dentist.svg');
     marker-fill: @health-color;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_veterinary'][zoom >= 17] {
     marker-file: url('symbols/veterinary.svg');
     marker-fill: @health-color;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_place_of_worship'][zoom >= 16] {
     marker-file: url('symbols/place_of_worship.svg');
     marker-fill: #000000;
-    marker-placement: interior;
     marker-clip: false;
     [religion = 'christian'] {
       marker-file: url('symbols/christian.svg');
@@ -524,49 +472,42 @@
   [feature = 'historic_wayside_cross'][zoom >= 17] {
     marker-file: url('symbols/christian.9.svg');
     marker-fill: #000000;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'historic_wayside_shrine'][zoom >= 17] {
     marker-file: url('symbols/shrine.svg');
     marker-fill: @man-made-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_police'][zoom >= 16] {
     marker-file: url('symbols/police.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_post_box'][zoom >= 17] {
     marker-file: url('symbols/post_box.12.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_post_office'][zoom >= 17] {
     marker-file: url('symbols/post_office.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_pub'][zoom >= 17] {
     marker-file: url('symbols/pub.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_biergarten'][zoom >= 17] {
     marker-file: url('symbols/biergarten.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -574,7 +515,6 @@
   [feature = 'amenity_recycling'][zoom >= 19] {
     marker-file: url('symbols/recycling.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
     [access != ''][access != 'permissive'][access != 'yes'] {
       marker-opacity: 0.33;
@@ -585,42 +525,36 @@
   [feature = 'amenity_food_court'][zoom >= 17] {
     marker-file: url('symbols/restaurant.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fast_food'][zoom >= 17] {
     marker-file: url('symbols/fast_food.svg');
     marker-fill: @gastronomy;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_telephone'][zoom >= 17] {
     marker-file: url('symbols/telephone.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'emergency_phone'][zoom >= 19] {
     marker-file: url('symbols/emergency_phone.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_theatre'][zoom >= 16] {
     marker-file: url('symbols/theatre.svg');
     marker-fill: @culture;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_arts_centre'][zoom >= 17] {
     marker-file: url('symbols/shop/art.svg');
     marker-fill: @culture;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -629,7 +563,6 @@
     [zoom >= 19] {
       marker-file: url('symbols/toilets.svg');
       marker-fill: @amenity-brown;
-      marker-placement: interior;
       marker-clip: false;
     }
   }
@@ -637,14 +570,12 @@
   [feature = 'amenity_drinking_water'][zoom >= 17] {
     marker-file: url('symbols/drinking_water.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_prison'][zoom >= 17] {
     marker-file: url('symbols/prison.svg');
     marker-fill: @public-service;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -656,7 +587,6 @@
         marker-width: 6;
       }
       marker-line-width: 0;
-      marker-placement: interior;
       marker-clip: false;
       marker-fill: darken(@societal_amenities, 70%);
     }
@@ -668,14 +598,12 @@
       marker-width: 6;
     }
     marker-line-width: 0;
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'tourism_viewpoint'][zoom >= 16] {
     marker-file: url('symbols/viewpoint.svg');
-    marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
@@ -683,21 +611,18 @@
   [feature = 'man_made_water_tower'][zoom >= 17] {
     marker-file: url('symbols/towers/water_tower.svg');
     marker-fill: @man-made-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'historic_memorial'][zoom >= 17] {
     marker-file: url('symbols/memorial.svg');
     marker-fill: @memorials;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'historic_memorial_plaque'][zoom >= 19] {
     marker-file: url('symbols/plaque.svg');
     marker-fill: @memorials;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -705,14 +630,12 @@
   [feature = 'historic_monument'][zoom >= 16] {
     marker-file: url('symbols/monument.svg');
     marker-fill: @memorials;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'historic_fort'][zoom >= 16] {
     marker-file: url('symbols/fort.svg');
     marker-fill: @memorials;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -721,7 +644,6 @@
   [feature = 'historic_manor'][zoom >= 15] {
     marker-file: url('symbols/castle.svg');
     marker-fill: @memorials;
-    marker-placement: interior;
     marker-clip: false;
     [castle_type = 'palace'],
     [castle_type = 'stately'] {
@@ -743,13 +665,11 @@
   [feature = 'historic_archaeological_site'][zoom >= 16] {
     marker-file: url('symbols/archaeological_site.svg');
     marker-fill: @culture;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_marketplace'][zoom >= 16][way_pixels > 3000],
   [feature = 'amenity_marketplace'][zoom >= 17] {
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
     marker-file: url('symbols/shop/marketplace.svg');
@@ -759,7 +679,6 @@
     [shop != 'mall'][zoom >= 17],
     [shop = 'supermarket'][zoom >= 16],
     [shop = 'department_store'][zoom >= 16] {
-      marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
     }
@@ -1046,7 +965,6 @@
   [feature = 'advertising_column'][zoom >= 19]{
       marker-file: url('symbols/advertising/column.svg');
       marker-fill: @advertising-grey;
-      marker-placement: interior;
       marker-clip: false;
   }
 
@@ -1057,14 +975,12 @@
       marker-width: 6;
     }
     marker-line-width: 0;
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @office;
   }
 
   [feature = 'leisure_water_park'][zoom >= 17] {
     marker-file: url('symbols/water_park.svg');
-    marker-placement: interior;
     marker-fill: @leisure-green;
     marker-clip: false;
   }
@@ -1072,14 +988,12 @@
   [feature = 'leisure_fitness_centre'][zoom >= 17],
   [feature = 'leisure_fitness_station'][zoom >= 17] {
     marker-file: url('symbols/fitness.svg');
-    marker-placement: interior;
     marker-fill: @leisure-green;
     marker-clip: false;
   }
 
   [feature = 'leisure_dog_park'][zoom >= 17] {
     marker-file: url('symbols/shop/pet.svg');
-    marker-placement: interior;
     marker-fill: @leisure-green;
     marker-clip: false;
   }
@@ -1087,7 +1001,6 @@
   [feature = 'leisure_playground'][zoom >= 17] {
     marker-file: url('symbols/playground.svg');
     marker-fill: @leisure-green;
-    marker-placement: interior;
     marker-clip: false;
     [access != ''][access != 'permissive'][access != 'yes'] {
       marker-opacity: 0.33;
@@ -1097,49 +1010,42 @@
   [feature = 'leisure_miniature_golf'][zoom >= 17] {
     marker-file: url('symbols/miniature_golf.svg');
     marker-fill: @leisure-green;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'leisure_golf_course'][zoom >= 15] {
     marker-file: url('symbols/golf.svg');
     marker-fill: @leisure-green;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_picnic_site'][zoom >= 16] {
     marker-file: url('symbols/picnic.svg');
     marker-fill: @leisure-green;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'leisure_picnic_table'][zoom >= 17] {
     marker-file: url('symbols/picnic.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'leisure_firepit'][zoom >= 17] {
     marker-file: url('symbols/firepit.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'leisure_sauna'][zoom >= 17] {
      marker-file: url('symbols/sauna.svg');
      marker-fill: @leisure-green;
-     marker-placement: interior;
      marker-clip: false;
    }
 
   [feature = 'leisure_beach_resort'][zoom >= 16] {
      marker-file: url('symbols/beach_resort.svg');
      marker-fill: @leisure-green;
-     marker-placement: interior;
      marker-clip: false;
    }
 
@@ -1147,13 +1053,11 @@
   [feature = 'leisure_slipway'][zoom >= 17] {
     marker-file: url('symbols/transport_slipway.p.20.svg');
     marker-fill: @transportation-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'aeroway_helipad'][zoom >= 16] {
     marker-file: url('symbols/helipad.16.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @airtransport;
   }
@@ -1161,21 +1065,18 @@
   [feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 14],
   [feature = 'aeroway_aerodrome'][zoom >= 11][zoom < 14] {
     marker-file: url('symbols/aerodrome.12.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @airtransport;
   }
 
   [feature = 'amenity_ferry_terminal'][zoom >= 15] {
     marker-file: url('symbols/ferry.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @airtransport;
   }
 
   [feature = 'man_made_lighthouse'][zoom >= 15] {
     marker-file: url('symbols/towers/lighthouse.svg');
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @man-made-icon;
   }
@@ -1183,27 +1084,23 @@
   [feature = 'natural_peak'][zoom >= 11] {
     marker-file: url('symbols/peak.svg');
     marker-fill: @landform-color;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'natural_volcano'][zoom >= 11] {
     marker-file: url('symbols/peak.svg');
     marker-fill: #d40000;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'natural_saddle'][zoom >= 15] {
     marker-file: url('symbols/saddle.svg');
     marker-fill: @landform-color;
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'natural_cave_entrance'][zoom >= 15] {
     marker-file: url('symbols/cave.svg');
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -1213,7 +1110,6 @@
     [zoom >= 15][name != null],
     [zoom >= 16] {
       marker-file: url('symbols/waterfall.svg');
-      marker-placement: interior;
       marker-clip: false;
       marker-fill: @water-text;
     }
@@ -1222,7 +1118,6 @@
   [feature = 'military_bunker'][zoom >= 17] {
     marker-file: url('symbols/bunker.svg');
     marker-fill: @man-made-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -1230,7 +1125,6 @@
   [feature = 'power_generator'][power_source = 'wind'] {
     [zoom >= 15] {
       marker-file: url('symbols/power_wind.svg');
-      marker-placement: interior;
       marker-fill: black;
       marker-clip: false;
     }
@@ -1238,7 +1132,6 @@
 
   [feature = 'man_made_windmill'][zoom >= 16] {
     marker-file: url('symbols/windmill.svg');
-    marker-placement: interior;
     marker-fill: @man-made-icon;
     marker-clip: false;
   }
@@ -1246,7 +1139,6 @@
   [feature = 'amenity_hunting_stand'][zoom >= 16] {
     marker-file: url('symbols/hunting_stand.svg');
     marker-fill: @man-made-icon;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -1257,7 +1149,6 @@
     [access = 'yes'] {
       marker-file: url('symbols/waste_disposal.svg');
       marker-fill: @amenity-brown;
-      marker-placement: interior;
     }
   }
 }
@@ -1267,7 +1158,6 @@
   [feature = 'historic_wayside_cross'][zoom >= 16] {
     marker-file: url('symbols/christian.9.svg');
     marker-fill: #000000;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -1283,7 +1173,6 @@
     [feature = 'amenity_motorcycle_parking'] {
       marker-file: url('symbols/motorcycle_parking.svg');
     }
-    marker-placement: interior;
     marker-clip: false;
     marker-fill: @transportation-icon;
     [access != ''][access != 'permissive'][access != 'yes'] {
@@ -1294,7 +1183,6 @@
   [feature = 'railway_level_crossing'][zoom >= 14]::railway,
   [feature = 'railway_crossing'][zoom >= 15]::railway{
     marker-file: url('symbols/level_crossing.svg');
-    marker-placement: interior;
     [zoom >= 16] {
       marker-file: url('symbols/level_crossing2.svg');
     }
@@ -1302,14 +1190,12 @@
 
   [feature = 'highway_mini_roundabout'][zoom >= 17]::highway {
     marker-file: url('symbols/mini_roundabout.svg');
-    marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'barrier_gate']::barrier {
     [zoom >= 17] {
       marker-file: url('symbols/gate.svg');
-      marker-placement: interior;
       marker-clip: false;
     }
   }
@@ -1318,7 +1204,6 @@
   [feature = 'barrier_swing_gate'][zoom >= 17]::barrier {
     marker-file: url('symbols/liftgate.svg');
     marker-fill: #3f3f3f;
-    marker-placement: interior;
     marker-clip: false;
   }
 
@@ -1329,7 +1214,6 @@
       marker-width: 3;
       marker-line-width: 0;
       marker-fill: #7d7c7c;
-      marker-placement: interior;
 
       [zoom >= 18] {
         marker-width: 4;
@@ -1340,13 +1224,11 @@
   [feature = 'amenity_bench'][zoom >= 19]::amenity {
     marker-file: url('symbols/bench.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
   }
 
   [feature = 'amenity_waste_basket'][zoom >= 19]::amenity {
     marker-file: url('symbols/waste_basket.10.svg');
     marker-fill: @amenity-brown;
-    marker-placement: interior;
   }
 
   // waste_disposal tagging on nodes - tagging on ways is defined earlier
@@ -1356,7 +1238,6 @@
     [access = 'yes'] {
       marker-file: url('symbols/waste_disposal.svg');
       marker-fill: @amenity-brown;
-      marker-placement: interior;
     }
   }
 }
@@ -1386,7 +1267,6 @@
     text-face-name: @oblique-fonts;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_pub'],
@@ -1408,7 +1288,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
       [feature = 'amenity_bar']{
         text-dy: 13;
       }
@@ -1436,7 +1315,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -1450,7 +1328,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'leisure_sauna'][zoom >= 17] {
@@ -1463,7 +1340,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_car_rental'][zoom >= 17],
@@ -1482,7 +1358,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_parking'][zoom >= 10][way_pixels > 900],
@@ -1497,7 +1372,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     [access != ''][access != 'permissive'][access != 'yes'] {
       text-opacity: 0.33;
       text-halo-radius: 0;
@@ -1531,7 +1405,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_car_wash'][zoom >= 17],
@@ -1552,7 +1425,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_place_of_worship'][zoom >= 17] {
@@ -1565,7 +1437,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_marketplace'][zoom >= 16][way_pixels > 3000],
@@ -1579,7 +1450,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: rgba(255, 255, 255, 0.6);
-    text-placement: interior;
   }
 
   [feature = 'natural_peak'][zoom >= 13],
@@ -1597,7 +1467,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'waterway_waterfall'] {
@@ -1614,7 +1483,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -1643,7 +1511,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'tourism_artwork'][zoom >= 17],
@@ -1663,7 +1530,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'military_bunker'][zoom >= 17],
@@ -1677,7 +1543,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'leisure_miniature_golf'][zoom >= 17],
@@ -1690,7 +1555,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     text-dy: 13;
   }
 
@@ -1708,7 +1572,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -1733,7 +1596,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -1754,7 +1616,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
       [access != ''][access != 'permissive'][access != 'yes'] {
         text-fill: darken(@park, 50%);
       }
@@ -1785,7 +1646,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
       [feature = 'landuse_military'] {
         text-fill: darken(@military, 40%);
       }
@@ -1821,7 +1681,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -1846,7 +1705,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -1922,7 +1780,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
       [feature = 'natural_reef'],
       [feature = 'natural_wetland'],
       [feature = 'natural_marsh'],
@@ -2046,7 +1903,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     [feature = 'natural_spring'] {
       text-dy: 6;
     }
@@ -2061,7 +1917,6 @@
     text-fill: @amenity-brown;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     text-face-name: @standard-font;
   }
 
@@ -2074,7 +1929,6 @@
     text-fill: @amenity-brown;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     text-face-name: @standard-font;
   }
 
@@ -2087,7 +1941,6 @@
     text-fill: @amenity-brown;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     text-face-name: @standard-font;
   }
 
@@ -2111,7 +1964,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     [feature = 'tourism_motel'] {
       text-dy: 13;
     }
@@ -2131,7 +1983,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'highway_bus_stop'],
@@ -2148,7 +1999,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
       [feature = 'highway_bus_stop'] {
         text-dy: 9;
       }
@@ -2176,7 +2026,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -2190,7 +2039,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
     [zoom >= 18] {
       text-dy: 10;
     }
@@ -2208,7 +2056,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_recycling'][recycling_type = 'centre'][zoom >= 17],
@@ -2222,7 +2069,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_hospital'][zoom >= 16] {
@@ -2235,7 +2081,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
 
@@ -2254,7 +2099,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -2268,7 +2112,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
       text-dy: 8;
       text-fill: darken(@societal_amenities, 70%);
     }
@@ -2285,7 +2128,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: rgba(255, 255, 255, 0.6);
-      text-placement: interior;
     }
   }
 
@@ -2370,7 +2212,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: rgba(255, 255, 255, 0.6);
-      text-placement: interior;
       [feature = 'shop_car_repair'] {
         text-fill: @amenity-brown;
       }
@@ -2406,7 +2247,6 @@
         text-face-name: @standard-font;
         text-halo-radius: @standard-halo-radius;
         text-halo-fill: rgba(255, 255, 255, 0.6);
-        text-placement: interior;
       }
     }
 
@@ -2444,7 +2284,6 @@
         text-face-name: @standard-font;
         text-halo-radius: @standard-halo-radius;
         text-halo-fill: rgba(255, 255, 255, 0.6);
-        text-placement: interior;
       }
     }
 
@@ -2459,7 +2298,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: rgba(255, 255, 255, 0.6);
-      text-placement: interior;
     }
   }
 
@@ -2475,7 +2313,6 @@
       text-face-name: @standard-font;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: rgba(255, 255, 255, 0.6);
-      text-placement: interior;
     }
   }
 
@@ -2488,7 +2325,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'power_plant'][is_building = 'no'][zoom >= 10],
@@ -2516,7 +2352,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -2543,7 +2378,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
       [feature = 'natural_scree'],
       [feature = 'natural_shingle'],
       [feature = 'natural_bare_rock'] {
@@ -2576,7 +2410,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -2602,7 +2435,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -2628,7 +2460,6 @@
       text-face-name: @landcover-face-name;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 
@@ -2642,7 +2473,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 14],
@@ -2657,7 +2487,6 @@
     text-face-name: @oblique-fonts;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'amenity_hunting_stand'][zoom >= 17] {
@@ -2670,7 +2499,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 
   [feature = 'natural_tree'][zoom >= 17] {
@@ -2686,7 +2514,6 @@
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
     text-halo-fill: @standard-halo-fill;
-    text-placement: interior;
   }
 }
 
diff --git a/placenames.mss b/placenames.mss
index 1f7c1d3558..f0008bb2e4 100644
--- a/placenames.mss
+++ b/placenames.mss
@@ -37,7 +37,6 @@
     text-face-name: @book-fonts;
     text-halo-fill: @standard-halo-fill;
     text-halo-radius: @standard-halo-radius * 1.5;
-    text-placement: interior;
     text-character-spacing: 0.5;
   }
 }
@@ -53,7 +52,6 @@
     text-face-name: @oblique-fonts;
     text-halo-fill: @standard-halo-fill;
     text-halo-radius: @standard-halo-radius * 1.5;
-    text-placement: interior;
     [zoom >= 7] {
       text-size: 11;
       text-wrap-width: 50; // 4.5 em
diff --git a/project.mml b/project.mml
index 1c69ea51ea..c04a538a54 100644
--- a/project.mml
+++ b/project.mml
@@ -1565,27 +1565,33 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |-
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
         (SELECT
-            way,
+            way AS w,
             name,
             ref,
             railway,
             aerialway
         FROM planet_osm_polygon
-        WHERE railway IN ('station', 'halt', 'tram_stop')
-          OR aerialway = 'station'
+        WHERE (railway IN ('station', 'halt', 'tram_stop')
+          OR aerialway = 'station')
+          AND way && !bbox!
+        ) AS sub
         ) AS stations_poly
     properties:
       minzoom: 12
   - id: amenity-points-poly
     class: points
-    geometry: polygon
+    geometry: point
     <<: *extents
     Datasource:
       <<: *osm2pgsql
       table: |-
-        (SELECT
-            way,
+        (SELECT *, ST_PointOnSurface(w) AS way
+         FROM
+          (SELECT
+            way AS w,
             name,
             COALESCE(
               'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,
@@ -1648,7 +1654,7 @@ Layer:
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
           -- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
-          WHERE aeroway IN ('helipad', 'aerodrome')
+          WHERE (aeroway IN ('helipad', 'aerodrome')
             OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'hostel',
                            'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site')
             OR amenity IS NOT NULL -- skip checking a huge list and use a null check
@@ -1663,8 +1669,10 @@ Layer:
             OR tags->'memorial' IN ('plaque')
             OR military IN ('bunker')
             OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
-            OR (power = 'generator' AND (tags @> '"generator:source"=>wind' OR tags @> 'power_source=>wind'))
+            OR (power = 'generator' AND (tags @> '"generator:source"=>wind' OR tags @> 'power_source=>wind')))
+            AND way && !bbox!
           ORDER BY way_area desc
+          ) AS sub
         ) AS amenity_points_poly
     properties:
       minzoom: 10
@@ -1895,7 +1903,9 @@ Layer:
           FROM planet_osm_point
           WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes'
         UNION ALL
-          SELECT
+          SELECT ST_PointOnSurface(way) AS way, highway, junction, ref, name, way_pixels
+          FROM
+          (SELECT
             way,
             highway,
             junction,
@@ -1904,7 +1914,8 @@ Layer:
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
           WHERE junction = 'yes'
-          ORDER BY way_pixels DESC NULLS LAST
+          and way && !bbox!
+          ORDER BY way_pixels DESC NULLS LAST) AS sub
         ) AS junctions
     properties:
       minzoom: 11
@@ -1914,14 +1925,18 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |-
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
         (SELECT
-            way,
+            way AS w,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
             man_made,
             name
           FROM planet_osm_polygon
           WHERE man_made = 'bridge'
+            AND way && !bbox!
           ORDER BY way_area DESC
+        ) AS sub
         ) AS bridge_text
     properties:
       minzoom: 11
@@ -1980,13 +1995,15 @@ Layer:
     properties:
       minzoom: 13
   - id: roads-area-text-name
-    geometry: polygon
+    geometry: POINT
     <<: *extents
     Datasource:
       <<: *osm2pgsql
       table: |-
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
         (SELECT
-            way,
+            way AS w,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
             highway,
             place,
@@ -2001,7 +2018,9 @@ Layer:
             OR (place IN ('square')
                 AND (leisure IS NULL OR NOT leisure IN ('park', 'common', 'recreation_ground', 'garden')))
             AND name IS NOT NULL
+            AND way && !bbox!
           ORDER BY way_area DESC
+        ) AS sub
         ) AS roads_area_text_name
     properties:
       minzoom: 15
@@ -2109,13 +2128,15 @@ Layer:
       minzoom: 11
   - id: text-poly-low-zoom
     class: text-low-zoom
-    geometry: polygon
+    geometry: point
     <<: *extents
     Datasource:
       <<: *osm2pgsql
       table: |-
-        (SELECT
-            way,
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
+          (SELECT
+            way AS w,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
             COALESCE(
               'landuse_' || CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse ELSE NULL END,
@@ -2135,22 +2156,26 @@ Layer:
               OR leisure IN ('nature_reserve'))
             AND building IS NULL
             AND name IS NOT NULL
+            AND way && !bbox!
           ORDER BY way_area DESC
+          ) AS sub
         ) AS text_poly_low_zoom
     properties:
       minzoom: 0
       maxzoom: 9
   - id: text-poly
     class: text
-    geometry: polygon
+    geometry: point
     <<: *extents
     Datasource:
       <<: *osm2pgsql
       # Include values that are rendered as icon without label to prevent mismatch between icons and labels,
       # see https://github.com/gravitystorm/openstreetmap-carto/pull/1349#issuecomment-77805678
       table: |-
-        (SELECT
-            way,
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
+          (SELECT
+            way AS w,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,
             COALESCE(
               'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,
@@ -2248,7 +2273,9 @@ Layer:
             AND (name IS NOT NULL
                  OR (ref IS NOT NULL AND aeroway IN ('gate'))
                 )
+            AND way && !bbox!
           ORDER BY way_area DESC
+          ) AS sub
         ) AS text_poly
     properties:
       minzoom: 10
@@ -2429,20 +2456,24 @@ Layer:
     properties:
       minzoom: 10
   - id: building-text
-    geometry: polygon
+    geometry: point
     <<: *extents
     Datasource:
       <<: *osm2pgsql
       table: |-
-        (SELECT
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
+          (SELECT
             name,
-            way,
+            way AS w,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
           WHERE building IS NOT NULL
             AND building NOT IN ('no')
             AND name IS NOT NULL
+            AND way && !bbox!
           ORDER BY way_area DESC
+          ) AS sub
         ) AS building_text
     properties:
       minzoom: 14
@@ -2465,6 +2496,8 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |-
+        (SELECT ST_PointOnSurface(way) AS way, addr_housenumber, addr_housename, addr_unit, way_pixels
+        FROM
         (SELECT
             way,
             "addr:housenumber" AS addr_housenumber,
@@ -2474,6 +2507,7 @@ Layer:
           FROM planet_osm_polygon
           WHERE (("addr:housenumber" IS NOT NULL) OR ("addr:housename" IS NOT NULL) OR ((tags->'addr:unit') IS NOT NULL))
             AND building IS NOT NULL
+            AND way && !bbox!) AS sub
         UNION ALL
         SELECT
             way,
@@ -2531,15 +2565,19 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |-
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
         (SELECT
-            way,
+            way AS w,
             name,
             admin_level
           FROM planet_osm_polygon
           WHERE boundary = 'administrative'
             AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
             AND name IS NOT NULL
+            AND way && !bbox!
           ORDER BY admin_level::integer ASC, way_area DESC
+        ) AS sub
         ) AS admin_text
     properties:
       minzoom: 16
@@ -2549,13 +2587,17 @@ Layer:
     Datasource:
       <<: *osm2pgsql
       table: |-
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
         (SELECT
-            way,
+            way AS w,
             name,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
           WHERE (boundary = 'national_park' OR leisure = 'nature_reserve')
             AND name IS NOT NULL
+            AND way && !bbox!
+        ) AS sub
         ) AS nature_reserve_text
     properties:
       minzoom: 13
@@ -2592,21 +2634,25 @@ Layer:
       minzoom: 14
   - id: amenity-low-priority-poly
     class: amenity-low-priority
-    geometry: polygon
+    geometry: point
     <<: *extents
     Datasource:
       <<: *osm2pgsql
       table: |-
-        (SELECT
-            way,
-            COALESCE(
-              'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
-              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log') THEN barrier ELSE NULL END
-            )  AS feature,
-            access
-          FROM planet_osm_polygon p
-          WHERE amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')
-             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log')
+        (SELECT *, ST_PointOnSurface(w) AS way
+        FROM
+          (SELECT
+              way AS w,
+              COALESCE(
+                'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
+                'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log') THEN barrier ELSE NULL END
+              )  AS feature,
+              access
+            FROM planet_osm_polygon p
+            WHERE (amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')
+               OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log'))
+            AND way && !bbox!
+            ) AS sub
           ) AS amenity_low_priority_poly
     properties:
       minzoom: 14
diff --git a/roads.mss b/roads.mss
index 8ca4e6f969..d0478028f1 100644
--- a/roads.mss
+++ b/roads.mss
@@ -2905,7 +2905,6 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
       text-halo-fill: @standard-halo-fill;
       text-margin: 3; // 0.3 em
       text-wrap-width: 30;
-      text-placement: interior;
       [way_pixels > 250] {
         text-size: 11;
         text-margin: 3.3; // 0.3 em
@@ -3461,7 +3460,6 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
     text-name: "[name]";
     text-size: 11;
     text-face-name: @book-fonts;
-    text-placement: interior;
     text-wrap-width: 30; // 2.7 em
     text-line-spacing: -1.7; // -0.15 em
   }
diff --git a/stations.mss b/stations.mss
index f16f9933fd..5c12a1bf27 100644
--- a/stations.mss
+++ b/stations.mss
@@ -4,7 +4,6 @@
 .stations {
   [railway = 'subway_entrance'][zoom >= 18] {
     marker-file: url('symbols/entrance.10.svg');
-    marker-placement: interior;
     marker-fill: @transportation-icon;
     marker-clip: false;
     [zoom >= 19] {
@@ -16,13 +15,11 @@
       text-halo-radius: @standard-halo-radius * 1.5;
       text-halo-fill: @standard-halo-fill;
       text-wrap-width: 0;
-      text-placement: interior;
     }
   }
 
   [railway = 'station'][zoom >= 12] {
     marker-file: url('symbols/square.svg');
-    marker-placement: interior;
     marker-fill: @station-color;
     marker-width: 4;
     marker-clip: false;
@@ -39,7 +36,6 @@
       text-halo-fill: @standard-halo-fill;
       text-wrap-width: 30; // 3 em
       text-line-spacing: -1.5; // -0.15 em
-      text-placement: interior;
     }
     [zoom >= 15] {
       marker-width: 9;
@@ -53,7 +49,6 @@
   [railway = 'halt'] {
     [zoom >= 13] {
       marker-file: url('symbols/square.svg');
-      marker-placement: interior;
       marker-fill: @station-color;
       marker-width: 4;
       marker-clip: false;
@@ -71,14 +66,12 @@
       text-halo-fill: @standard-halo-fill;
       text-wrap-width: @standard-wrap-width;
       text-line-spacing: @standard-line-spacing-size;
-      text-placement: interior;
     }
   }
 
   [aerialway = 'station']::aerialway {
     [zoom >= 13] {
       marker-file: url('symbols/square.svg');
-      marker-placement: interior;
       marker-fill: @station-color;
       marker-width: 4;
       marker-clip: false;
@@ -96,14 +89,12 @@
       text-halo-fill: @standard-halo-fill;
       text-wrap-width: @standard-wrap-width;
       text-line-spacing: @standard-line-spacing-size;
-      text-placement: interior;
     }
   }
 
   [railway = 'tram_stop'] {
     [zoom >= 13] {
       marker-file: url('symbols/square.svg');
-      marker-placement: interior;
       marker-fill: @station-color;
       marker-width: 4;
       marker-clip: false;
@@ -121,7 +112,6 @@
       text-halo-fill: @standard-halo-fill;
       text-wrap-width: @standard-wrap-width;
       text-line-spacing: @standard-line-spacing-size;
-      text-placement: interior;
     }
   }
 }
diff --git a/water-features.mss b/water-features.mss
index f097f81678..73fbaf98bf 100644
--- a/water-features.mss
+++ b/water-features.mss
@@ -127,9 +127,6 @@
       text-fill: #222;
       text-size: 10;
       text-face-name: @book-fonts;
-      #text-poly {
-        text-placement: interior;
-      }
       #text-line {
         text-placement: line;
         text-dy: 8;
@@ -153,9 +150,6 @@
       text-fill: #222;
       text-size: 10;
       text-face-name: @book-fonts;
-      #text-poly {
-        text-placement: interior;
-      }
       #text-line {
         text-placement: line;
         text-spacing: 400;
@@ -167,7 +161,6 @@
 #springs {
   [natural = 'spring'][zoom >= 14] {
     marker-file: url('symbols/spring.svg');
-    marker-placement: interior;
     marker-clip: false;
   }
 }
diff --git a/water.mss b/water.mss
index 66901ff9e7..b544ab8b41 100644
--- a/water.mss
+++ b/water.mss
@@ -330,7 +330,6 @@
       text-face-name: @oblique-fonts;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-placement: interior;
     }
   }
 }