New changes to Location Selector