Removed HTMLEntities conversion