Changes
   * Highlighter Bug Fix
Changes
   * Highlighter Bug Fix