Improve behaviour with sortOrder parameter