improvements to 477 report, #21703