Adds operator override for fields with choices