SONATA-191 - Added consistency with order labels