Merge pull request #16803 from hrwX/route-fix

fix(route): Route for DocTypes and Reports