Fixed ampersands in search terms, and a search term highlighting bug when terms had spaces and the beginning or end