Update to support attributes surrounded by HTML-entity-encoded quotes .