Really fixed the searching bug