new search terms
fixed merge