fix last merge - highlight support