Orders improvements

- Fixes #1532