Fixup data1 tags which makes XML non-wellformed.. This effectively