ensure all reports work correctly after #25994 changes