issue #19379: less fragile report route
Merge pull request #137 from shackbarth/19379

issue #19379: less fragile report route