Fix filtering behavior for rows with subrows