Fix rank bug when page > max
Merge branch 'feature-results' into develop
Merge branch 'develop'