fix issues related to hl7: TDI-29999 / TDI-29925 / TDI-30016 /TDI-29453