Add better html encoding & decoding