fixed report generation issues