Fixed the searching