Better Sorting
Update claims to reflect new sort