cdhistory: improved ranking
Merge branch 'staging'