Add InQuery and InRangeQuery