Rework of reporting tab