allow objectID as value
Merge branch 'criteria-objectid'