Further bugs in the Locations UI
Merge branch 'dev'