Added html entity decoding