Tweak to improve stability with previous sort order

(Manual tweaks b/c previous commit made it look like some people had been deleted, when they were just relocated)