Add subset index validation and reodering