support low level options on criteria
Merge branch 'select-fields'