Add compare operators to query grammar