Fix sorting behavior and add tooltips for better experience (#2112)
Merge pull request #2397 from lukasolson/issue-2112

Fix sorting behavior and add tooltips