Added logic to pick location from browser and from map