UAR-677 Fixing custom data sort order.