sorting and slug
Merge branch 'develop'