Fixed Semantic Highlighting