changes for sort order with context
sort context changes
Object browser fix, Commit fix for empty view
Cheetah tests