cel: Make sure channels in extra fields include their unique IDs as well