Improvement for rankings and latest hotfixes