Added html decoding