fixes bug related to custom fields filter
Merge branch 'hotfix/0.1.2' into develop