OPAL-2071: Filter on values improvements