ChannelSelection: Less complex code for rename services/bouquets/markers