One more change to tighten the sorting.

Still looks weird, still need to revisit.