More fixes for use dynamic forms