Improvements for ordering in custom exports