Update the handling of the submissions so that we can avoid the need for ParseDate