ChannelSelection: Small improvement regarding history zap