Schema now merges properly with form in fieldsets