add more constraints
correct sorting
correct lt/gt constraint matchers