Bug 17820: use ->find instead of search->next