fixed bugs in City field