Significantly improved location detection and selection