reworking search
Revert "reworking search"

This reverts commit 73d02d0de096e0e910acb17449c1939e19fe3dbb.