Fixed more of city input