Fix global report generation to deal with simple keys