Switch to new locations api