Issue #72

Improve field filtering at lower level