Replaced $.util.highlightMatchingCharacters with util.highlightSubstring