Fix general report and labels of report

Fix general report and labels of report