Hi Frank,
I’ve nearly same problem with custom fields. Did you find a solution for this ?
Regards, Lars