SONAR-4391 Fix some display issues and fix issue on sort