SaveFile keywords bug fix for all entity types for sample composition