diff --git a/amenity-points.mss b/amenity-points.mss
index e9976b6778..679fcd20ef 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1728,7 +1728,7 @@
     }
   }
 
-  [feature = 'tourism_attraction'][zoom >= 17] {
+  [feature = 'tourism_attraction'][name != null][zoom >= 17] {
     marker-file: url('symbols/square.svg');
     marker-fill: @tourism;
     marker-placement: interior;
diff --git a/project.mml b/project.mml
index 5f65ab448f..c45440adf2 100644
--- a/project.mml
+++ b/project.mml
@@ -2540,6 +2540,7 @@ Layer:
       table: |-
         (SELECT
             way,
+            name,
             COALESCE(
               'highway_' || CASE WHEN highway IN ('mini_roundabout') THEN highway ELSE NULL END,
               'railway_' || CASE WHEN railway IN ('level_crossing', 'crossing') THEN railway ELSE NULL END,
@@ -2573,6 +2574,7 @@ Layer:
       table: |-
         (SELECT
             way,
+            name,
             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', 'cattle_grid', 'stile') THEN barrier ELSE NULL END,