add fix for htmlEncode