Fix bug ordering and datatable link

Merged Tifenn Guillas requested to merge fix-bug-ordering-and-datatable-link into develop

Merge request reports