Fix dynamic forms and basic collection updates