[IMP] improved code to set o2m fileds properly and dont add fields which dosent contain data.