fix bug with forms where data and ui have different hierarchies

and add tests
this file was both from a test user and de-id'd by the way