Added search for locations