FIX: a hack solution to get around existing lazy loading issue
see: https://github.com/silverstripe/silverstripe-framework/issues/1682
Prevent order being calculated twice.
Minor tidies