Changes for new search interface