Add missing variable values to headers #1570
Fix topic level count with parts in PDF #1571