Work on results highlighting