Revert "Fixed merged conflict in Search"

This reverts commit 3e48ea9ad80ec772ccf9b30cdabe8e722bebdf92, reversing
changes made to e55dd6d31b052552d4699ae4abab2977e70a34f5.