Dynamic form helpers improved