Fixing bugs in public form submit