Content filter
Merge branch 'hotfix/cont_filter'