Make new search system work