finishing work on reports, fixes #6509