Change map function in channel select Fixes #3