Navigation: When submitting a form via GET, strip query off URL before creating new query string. Fixes #5710.
Merge branch 'fix-5710'