Fixed an issue with double ? in the query paramters