Revert "interface change and custom search correction..."

This reverts commit 3ccdd25673c144a5591a123a19a0a1c76da206c5.