Now with the option of searching in results and adding extra highlights