Revert "Revert "fixed related data re-ordering not working" and its followed fix"

No, it didn't have affect, tested with clean fabrik