Better handling of city dropdown