Move to using both loose and detailed location data, as available