Fixed query string being incorrectly decoded