Filter orderby only if querying providers
Merge branch 'hotfix/providers_sort'