refactor order content model

fixes #5545