Try to fix some issues found by Scrutinizer-CI
Extend backend order filtering
Merge pull request #1671 from stloyd/feature/order_filter

Extend backend order filtering
Merge pull request #1667 from stloyd/bugfix/ci_issues

Try to fix some issues found by Scrutinizer-CI