Fix submit validation and post-submission behavior