Do some reformatting
Issue #2326503: Adds an offset setting for new report ids