Fix issues with word breaks and highlighting and add tests (#2415)
Merge pull request #2422 from lukasolson/issue-2415

Fix issues with adding word breaks and highlighting