Add city into exported address data
Tweak address export