Merge pull request #343 from emorency/master

OPAL-2071: Filter on values improvements