Navigation: When submitting a form via GET, strip query off URL before creating new query string. Fixes #5710.
(cherry picked from commit 0d4e839782c8574799b31ff222f80c683dccac88)