fix form schema mapping