Enhanced verify search (#1338)