diff --git a/buildings.mss b/buildings.mss
index acb9026079..12d32f169e 100644
--- a/buildings.mss
+++ b/buildings.mss
@@ -46,7 +46,11 @@
 }
 
 #entrances {
-  ["entrance" != null] {
+  ["entrance" = "yes"],
+  ["entrance" = "main"],
+  ["entrance" = "home"],
+  ["entrance" = "service"],
+  ["entrance" = "staircase"] {
     marker-fill: @entrance-normal;
     marker-allow-overlap: true;
     marker-ignore-placement: true;
@@ -57,16 +61,14 @@
     ["entrance" = "service"] {
       marker-file: url('symbols/corners.svg');
     }
-    ["access" = "yes"],["access" = "permissive"] {
+    ["access" = "yes"],
+    ["access" = "permissive"] {
       marker-fill: @entrance-permissive;
     }
     ["access" = "no"] {
       marker-fill: @entrance-normal;
       marker-file: url('symbols/rectdiag.svg');
     }
-    ["entrance" = "exit"],["entrance" = "emergency"] {
-      marker-opacity: 0.0;
-    }
     [zoom >= 17] {
       marker-width: 4.0;
       marker-height: 4.0;