Revert "revert to working search."

This reverts commit 01098fef2a913fa834a4696ed8e4e494fd21186e.