integrated emmanuel's changes to submit.liquid
again ... integrated Emmanuel's changes