Fix alphabetical sorting issues.
Merge branch 'sorting-fix'
Merge branch 'artwork-store'
Merge branch 'master' into artwork-general