diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt
index fa50ec9094..c9176ad5ec 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/bus_stop_name/AddBusStopName.kt
@@ -13,8 +13,10 @@ class AddBusStopName : OsmFilterQuestType<BusStopNameAnswer>() {
     override val elementFilter = """
         nodes, ways, relations with
         (
-          public_transport = platform
+          public_transport = platform and bus = yes
           or (highway = bus_stop and public_transport != stop_position)
+          or railway = halt
+          or railway = station
         )
         and !name and noname != yes and name:signed != no
     """