Fix ignoring some geo location data

* Fix xml record structure and underlying test
Use local assignment first and modify field variable when necessary
Merge pull request #219 from dr0i/organisation-fixes

Fix ignoring some geo location data