bug fixes
Merge https://github.com/athalhammer/RENDER-ranking-service
trying to fix it