Added more search capabilities