Add search function
Fix make_search method