advanced handling for dynamic fields
updates to dynamic field handling