[OEM-224] fixed some bugs and moved the report code into models