updating for new schema and html entities parsing