Put word boundaries during token replacing