added sorting to main channel view
merged upstream