better handling of subform data in forms api