Better support for amenity=bus_station (closes #2308)