r1829 + done some search overhaul according to ticket:20