Add option to return nil rows.
Made self-consistent.