SSP-2649 improve sort, adjust ui display