Fixing display field filter issue, closes #10