Merge pull request #7288 from annando/fix-search