Improved handling of station names