Add possibility to order channels hierarchically by server