diff --git a/src/fetchStats.js b/src/fetchStats.js
index f8bb715855492..24ecfa90b9b7e 100644
--- a/src/fetchStats.js
+++ b/src/fetchStats.js
@@ -26,7 +26,7 @@ const fetcher = (variables, token) => {
           followers {
             totalCount
           }
-          repositories(first: 100, orderBy: { direction: DESC, field: STARGAZERS }) {
+          repositories(first: 100, ownerAffiliations: OWNER, isFork: false, orderBy: {direction: DESC, field: STARGAZERS}) {
             totalCount
             nodes {
               stargazers {
diff --git a/src/renderStatsCard.js b/src/renderStatsCard.js
index 1713ac0ea3e49..75259de894631 100644
--- a/src/renderStatsCard.js
+++ b/src/renderStatsCard.js
@@ -127,14 +127,9 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
         </text>
       </g>`;
 
-  // re-adjust circle progressbar's value until the ranking algo is improved
-  let progress = rank.score;
-  if (rank.score > 86) {
-    progress = (40 + rank.score) * 0.6;
-  }
-  if (rank.score < 40) {
-    progress = 40 + rank.score;
-  }
+  // the better user's score the the rank will be closer to zero so
+  // subtracting 100 to get the progress in 100%
+  let progress = 100 - rank.score;
 
   const styles = getStyles({
     titleColor,