Issue #3567075: There appears a warning when there is no queryString Issue #3581681: Fix quality code issues
