Final edit on SearchManager