Refactor sort item naming
Sort order property is now 1 indexed
Fix issue with tiered sort renamings