fix sortings
remove useful scopes
Merge branch 'hotfix/v2.8.2'

* hotfix/v2.8.2:
  remove useful scopes
  fix sortings