Fixed htmlEncode