Fix nonexistent attributes in sort orders
Merge branch 'develop'