Add ability to parse query parameters added on lines beginning with & or ?