AUI-1536 FormBuilder - Nested fields not working after refactoring