Add support for html entities in attrribute values