Tidy up #make_search_term, make #build_search_term