[#41] search fixed