Fixed html encoding issue