Fix some more issue on top second level report.