fix bug with forms where data and ui have different hierarchies