Fixed one error
fixed sorting bugs
fixed issues from code review
Merge branch 'feature/SortAppLists' into develop