Added decoding of HTML encoded characters