Revert "Revert "Revert "Fixed search"""

This reverts commit 17b9423117ec1c9f4164a8dc88fe93f0950d34bb.