Fix City Add/Edit