Adding htmlEntities per the PR comment