Make highlights only match word boundaries

Fix #79