Almost working search
Revert "Almost working search"

This reverts commit beb40d9eb741ebab4ca8737b1e3a51783b231167.