Added __oneof to allow indicating property values which are not objects
added all match_* query variants
some more bug fixes