Enabled both data object and collection queries in the same
invocation.
Merge pull request #4 from keithj/devel

Enabled both data object and collection queries