Fixing highlight selected word performance
Merge pull request #1186 from diegosarmentero/master

  Fixing highlight selected word performance