Cleaner version of search