Changed way to filter combine field
Merge branch 'hotfix-1.01'