GIVEY-495 handle channel selection