Modify sorting logic

[josef-brisk-cache]

Hi @stefan-cold-haze , would this post help you?