Merge pull request #4124 from tohojo/adv-search-fix