fixed city parsing