[#41] fixed search method