diff --git a/codegen.ts b/codegen.ts
index ea7b7aef..f2da4f43 100644
--- a/codegen.ts
+++ b/codegen.ts
@@ -3,8 +3,8 @@ import type { CodegenConfig } from '@graphql-codegen/cli'
 import { Network } from './src/utils/enums'
 import configs from './src/utils/configs'
 
-// TODO change
-let network: Network = Network.Mainnet
+
+let network: Network = Network.Holesky
 
 if (process.env.NETWORK === 'mainnet') {
   network = Network.Mainnet
diff --git a/src/graphql/subgraph/stats/fiatRatesQuery.graphql b/src/graphql/subgraph/stats/fiatRatesQuery.graphql
index ccea6ff6..c739c065 100644
--- a/src/graphql/subgraph/stats/fiatRatesQuery.graphql
+++ b/src/graphql/subgraph/stats/fiatRatesQuery.graphql
@@ -1,5 +1,5 @@
 query FiatRates {
-  networks {
+  exchangeRates {
     assetsUsdRate
     usdToEurRate
     usdToGbpRate
diff --git a/src/graphql/subgraph/vault/userRewardsQuery.graphql b/src/graphql/subgraph/vault/userRewardsQuery.graphql
index a7926481..0f5eaa60 100644
--- a/src/graphql/subgraph/vault/userRewardsQuery.graphql
+++ b/src/graphql/subgraph/vault/userRewardsQuery.graphql
@@ -1,8 +1,10 @@
 query UserRewards(
   $where: AllocatorStats_filter
+  $limit: Int
 ) {
   allocator: allocatorStats_collection(
     interval: day
+    first: $limit
     where: $where
   ) {
     apy
diff --git a/src/graphql/subgraph/vault/vaultStatsQuery.graphql b/src/graphql/subgraph/vault/vaultStatsQuery.graphql
index 5ff1e1a0..03116441 100644
--- a/src/graphql/subgraph/vault/vaultStatsQuery.graphql
+++ b/src/graphql/subgraph/vault/vaultStatsQuery.graphql
@@ -1,6 +1,7 @@
-query VaultStats($vaultAddress: String!  $timestamp: Timestamp!) {
+query VaultStats($vaultAddress: String!  $timestamp: Timestamp!, $limit: Int) {
   vaultStats: vaultStats_collection(
     interval: day
+    first: $limit
     where: {
       vault: $vaultAddress
       timestamp_gte: $timestamp,
diff --git a/src/methods/utils/getFiatRates/index.ts b/src/methods/utils/getFiatRates/index.ts
index ea7a4b9c..6c9b4895 100644
--- a/src/methods/utils/getFiatRates/index.ts
+++ b/src/methods/utils/getFiatRates/index.ts
@@ -8,7 +8,7 @@ type GetFiatRatesInput = {
 
 const getGnoRate = () => graphql.subgraph.stats.fetchFiatRatesQuery({
   url: configs[Network.Gnosis].api.subgraph,
-  modifyResult: (data) => Number(data.networks[0].assetsUsdRate),
+  modifyResult: (data) => Number(data.exchangeRates[0].assetsUsdRate),
 })
 
 const getFiatRates = (values: GetFiatRatesInput) => {
@@ -26,7 +26,7 @@ const getFiatRates = (values: GetFiatRatesInput) => {
         usdToKrwRate,
         usdToAudRate,
         swiseUsdRate,
-      } = data.networks[0]
+      } = data.exchangeRates[0]
 
       let assetUsd = Number(assetsUsdRate)
 
diff --git a/src/methods/vault/requests/getUserRewards/index.ts b/src/methods/vault/requests/getUserRewards/index.ts
index 43a2ac2b..fc84ef50 100644
--- a/src/methods/vault/requests/getUserRewards/index.ts
+++ b/src/methods/vault/requests/getUserRewards/index.ts
@@ -11,6 +11,12 @@ type GetUserRewardsInput = {
   vaultAddress: string
 }
 
+const calculateLimit = (dateTo: number, dateFrom: number): number => {
+  const millisecondsInDay = 1000 * 60 * 60 * 24
+
+  return Math.floor((dateTo - dateFrom) / millisecondsInDay)
+}
+
 const getUserRewards = async (input: GetUserRewardsInput): Promise<MergedReward[]> => {
   const { options, vaultAddress, userAddress, dateFrom, dateTo } = input
 
@@ -29,6 +35,8 @@ const getUserRewards = async (input: GetUserRewardsInput): Promise<MergedReward[
     ? configs[Network.Mainnet].api.subgraph
     : subgraphUrl
 
+  const limit = calculateLimit(dateTo, dateFrom)
+
   const timestampTo = String(dateTo * 1_000)
   const timestampFrom = String(dateFrom * 1_000)
 
@@ -36,6 +44,7 @@ const getUserRewards = async (input: GetUserRewardsInput): Promise<MergedReward[
     graphql.subgraph.vault.fetchUserRewardsQuery({
       url: subgraphUrl,
       variables: {
+        limit,
         where: {
           timestamp_lte: timestampTo,
           timestamp_gte: timestampFrom,
diff --git a/src/methods/vault/requests/getUserStats/index.ts b/src/methods/vault/requests/getUserStats/index.ts
index 4fce8107..985d758b 100644
--- a/src/methods/vault/requests/getUserStats/index.ts
+++ b/src/methods/vault/requests/getUserStats/index.ts
@@ -1,6 +1,5 @@
 import { apiUrls, validateArgs, calculateUserStats, getTimestamp } from '../../../../utils'
 import graphql from '../../../../graphql'
-import { StakeWiseSubgraphGraph } from '../../../../types/graphql/subgraph'
 
 
 type GetUserStatsInput = {
@@ -19,6 +18,7 @@ const getUserStats = (input: GetUserStatsInput) => {
   return graphql.subgraph.vault.fetchUserRewardsQuery({
     url: apiUrls.getSubgraphqlUrl(options),
     variables: {
+      limit: daysCount,
       where: {
         timestamp_gte: String(getTimestamp(daysCount)),
         allocator_: {
diff --git a/src/methods/vault/requests/getVaultStats/index.ts b/src/methods/vault/requests/getVaultStats/index.ts
index 043f0dab..15a6cae6 100644
--- a/src/methods/vault/requests/getVaultStats/index.ts
+++ b/src/methods/vault/requests/getVaultStats/index.ts
@@ -21,6 +21,7 @@ const getVaultStats = (input: GetVaultStatsInput) => {
     url: apiUrls.getSubgraphqlUrl(options),
     variables: {
       timestamp,
+      limit: daysCount,
       vaultAddress: vaultAddress.toLowerCase(),
     },
     modifyResult: modifyVaultStats,