Flag submitter improvements