Updated html decoding