SortOrder support
wip: FolderView
Merge branch 'sort-order'