data definition fixes
fixes
fix
reporting:  Remaining changes on top of Surangas contribution in order to complete REPORT-392