Added _do_search