Fixed XML encoding of field values