Fix so that the x-field-extra-annotation properly split any array items

Fix so that the x-field-extra-annotation properly split any array items #12777