Further bugs in the Locations UI