[#14] fixed searching