477 report rewrite, #28020
bugfixes