ChannelSelection: Add history related sanity checks

Avoid pushing None services to the history