fix channelname and channelnumber in display (reverse-merged from commit 5f90e0c58e9b98450e9d6c25c053f5eea4975e13)