something went wrong here. You're deleting all form="short" roles - is that on purpose? I _think_ CSL will just jump to the long form, but I'm not 100% sure and I'd rather have these be duplicate if there is no dedicated short form.

You're also mixing form="verb" with the long form terms (and then repeat to verb forms below)