XD-1173 Fixed parser bug to include index in source channel names