Added term highlighting