changed form id handling to use MapField
don't populate submit buttons