diff --git a/project.mml b/project.mml
index a4b48553b9..936a30101b 100644
--- a/project.mml
+++ b/project.mml
@@ -672,13 +672,14 @@ Layer:
       table: |-
         (SELECT
             way,
+            tags->'location' as location,
             COALESCE((
               'highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'track', 'path', 'platform') THEN highway ELSE NULL END)),
-              ('railway_' || (CASE WHEN railway IN ('platform') THEN railway ELSE NULL END))
+              ('railway_' || (CASE WHEN (railway IN ('platform') AND tags->'location' NOT IN ('underground')) THEN railway ELSE NULL END))
             ) AS feature
           FROM planet_osm_polygon
           WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'track', 'path', 'platform')
-            OR railway IN ('platform')
+            OR (railway IN ('platform') AND tags->'location' NOT IN ('underground'))
           ORDER BY COALESCE(layer,0), way_area DESC
         ) AS highway_area_casing
     properties:
@@ -782,15 +783,16 @@ Layer:
       table: |-
         (SELECT
             way,
+            tags->'location' as location,
             COALESCE(
               ('highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street',
                                                     'track', 'path', 'platform', 'services') THEN highway ELSE NULL END)),
-              ('railway_' || (CASE WHEN railway IN ('platform') THEN railway ELSE NULL END)),
+              ('railway_' || (CASE WHEN (railway IN ('platform') AND tags->'location' NOT IN ('underground')) THEN railway ELSE NULL END)),
               (('aeroway_' || CASE WHEN aeroway IN ('runway', 'taxiway', 'helipad') THEN aeroway ELSE NULL END))
             ) AS feature
           FROM planet_osm_polygon
           WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'living_street', 'track', 'path', 'platform', 'services')
-            OR railway IN ('platform')
+            OR (railway IN ('platform') AND tags->'location' NOT IN ('underground'))
             OR aeroway IN ('runway', 'taxiway', 'helipad')
           ORDER BY COALESCE(layer,0), way_area desc
         ) AS highway_area_fill