improve order form submit behaviour 4