added sort order
Merge branch 'hotfix/smart-content-sort'