Remove unnecessary ReportModel
Fix position of last category when the previous is blank