Add not= query comparator
Remove duplication in query comparator definitions