[OEM-224] enhancements to new reporting system