improve order form submit behaviour 9