Added step for searching by name or address