Touch up search and highlight