Rework

merge bugfix for wrong channel select when long press a channel.