Locations fix (failing, check comments)

The 'Default' name was overwritten by socket updates