added two filters
Merge branch 'hotfixes' into develop