improve order form submit behaviour 6