fix pre-built form handling