Fix and extend the zpool scrub parsing