Improve channel select