add a filter for additional fields
Merge branch 'develop'