GIVEY-321 #start #comment handle new channel fields