improved search to use all search terms, escape regex