simplify search

It was getting too complicated, TBH.