[Highlighting] Fixed some semantic highlighting bugs
v2.1.3