diff --git a/frontend/src/Components/Chart/StackedBarChart.js b/frontend/src/Components/Chart/StackedBarChart.js
index 3cca1ba81..b69fd8e03 100644
--- a/frontend/src/Components/Chart/StackedBarChart.js
+++ b/frontend/src/Components/Chart/StackedBarChart.js
@@ -46,6 +46,10 @@ class StackedBarChart extends Component {
               size: 14,
               family: defaultFontFamily
             }
+          },
+          tooltip: {
+            mode: 'index',
+            position: 'average'
           }
         }
       },
diff --git a/frontend/src/Indexer/Stats/IndexerStats.tsx b/frontend/src/Indexer/Stats/IndexerStats.tsx
index 77ac3ea85..0ca17f785 100644
--- a/frontend/src/Indexer/Stats/IndexerStats.tsx
+++ b/frontend/src/Indexer/Stats/IndexerStats.tsx
@@ -73,10 +73,12 @@ function getFailureRateData(indexerStats: IndexerStatsIndexer[]) {
 }
 
 function getTotalRequestsData(indexerStats: IndexerStatsIndexer[]) {
-  const statistics = [...indexerStats].sort((a, b) =>
-    a.numberOfQueries === b.numberOfQueries
-      ? b.numberOfRssQueries - a.numberOfRssQueries
-      : b.numberOfQueries - a.numberOfQueries
+  const statistics = [...indexerStats].sort(
+    (a, b) =>
+      b.numberOfQueries +
+      b.numberOfRssQueries +
+      b.numberOfAuthQueries -
+      (a.numberOfQueries + a.numberOfRssQueries + a.numberOfAuthQueries)
   );
 
   return {