Restore sorter_rank behavior