ISAICP-6325: Improve the order handling between draft and published. Allow multiple entity loads to work properly.