fixed failing search query
Merge branch 'common_fixes'