Fixed the searching issue