Backport fix results ordering