Edit File bug fix for all entity types for sample composition