NXP-12932: fixing nested forms