Merge pull request #4501 from annando/fix-tag-search