Fixing check for valid channels to handle both Channels and ChannelsExtended