Fixed city update and imported utils for editCity