Don't lose the query string when parsing URLs