station_finder fixes