improve order form submit behaviour 3