Improve clickbench-sorted to better reflect sorted data (#8584)

Improve clickbench-sorted to better reflect sorted data (#8584) #4368