changes for Auto City Selection

changes for Auto City Selection