Updated OData queries