+ Change the Organization Address global attribute to use a location field instead of free text
+ Modified some location fields to be more consistent