UNDERTOW-299 Include the ? in the query string