Better handling of composed symbols.
Adds highlight symbol.