Bug fix for feed type schema, improve EnhancedContentEntityProcessor