changed
fixed null city problem