ChannelSelection: Improve and simplify correctChannelNumber

Thanks for Dima73 for the hints