Enabled both data object and collection queries

Enabled both data object and collection queries in the same invocation.