added a new filter in search conditions
Merge branch 'hotfixes' into develop