Improve order handling

Related to #732