Rework data handles to correctly sort the subset array