Locations loading fixed