fixes in collection and match of criteria