Added channel re-sorting