Query in operator field improved, age search changed to two fields.

Rebased on top of last Master.