Fix word highlighting