Added back htmlentitydecode