Finished CollectionQuery prototype