added handling for when question mark is part of the values in the query string