add html entity support