bugfix
Merge branch 'hotfix/sorting'
Merge tag 'sorting' into develop

bugfix sorting