fix search filter

(cherry picked from commit 794bded8a5fc4099f8ed38e2671d429e58303991)
Merge branch 'MasterBugFixing' into 'master'
Merge branch 'master' into 'MasterBugFixing'