SONAR-5052 Rework table sort