[#48] Fixed search method