Added search for other locations.