Fixed a bug in CollectionResource where Query wasnt async. Other minor fixes.