fixed form submission issues