Fix hilite

Please review  and merge the fix for highlighting text.