Started to include OSM for location selection