Manual apply of @mannih fix in highlight

Thank's for the fix. Added fix to string inside quotes too.

Fixes #134
Add a changelog entry