Refactor highlight functionality. Add search.