Update address fields to generalize field names

Merged Martin Lowe requested to merge github/fork/autumnfound/malowe/master/211_2 into master

Merge request reports