fix static highlight bugs

#1681 #1682
Merge pull request #1683 from ajaxorg/static_highlight

fix static highlight bugs
Merge remote-tracking branch 'upstream/master' into develop