Comparators removed, binary query added.