Simplify verification search (#1362)