fix for yellow tiger search problem
Merge branch 'hotfix-yellowtiger'