fixed comperator -> comparator
default operator
added support for and/or collection
property now correctly parses type value