fix form schema mapping
Merge branch 'no-forms' into staging-yedi