Code updates after QA
Merge pull request #4430 from lwyszomi/revert-4205-revert-3841-86347-2

Improvements for ordering in custom exports - code update after QA