Bug fixes to order editing