improve order form submit behaviour 2