Description

Kindly fix the error, wherein there are two question marks "?" concatenated with the request Url whenever ServiceDescriptor and QueryDefinition are being used together.

Step to Reproduce

We are using ServiceDescriptor to use a custom web method (e.g. QueryResult GetItemsByUser(string userName)) from the controller to get data for an entity with the help of stored procedures to satisfy complex business rules. While at the same viewmodel, we are using QueryDefinition to enable searching, includes, and sorting.

Actual Result

http://localhost/data/Enterprise/GetItemsByUser?$expand=Locations&$orderby=LocationName?userName=mike

Expected Result

http://localhost/data/Enterprise/GetItemsByUser?userName=mike&$expand=Locations&$orderby=LocationName