Refactors searching

Yup