Merge branch 'dev'
Improved list, search, and tree views by adding aliases.