diff --git a/.github/workflows/vaults-and-reserve-metrics-testing.yml b/.github/workflows/vaults-and-reserve-metrics-testing.yml
index 3cc172fa..3eed4826 100644
--- a/.github/workflows/vaults-and-reserve-metrics-testing.yml
+++ b/.github/workflows/vaults-and-reserve-metrics-testing.yml
@@ -55,13 +55,13 @@ jobs:
         run: ./scripts/validateData.mjs
         env:
           entity: vaultManagerGovernances
-          blockHeight: 1178
+          blockHeight: 1185
 
       - name: Test VaultManagerMetrics
         run: ./scripts/validateData.mjs
         env:
           entity: vaultManagerMetrics
-          blockHeight: 1170
+          blockHeight: 1226
 
       - name: Test VaultManagerMetricsDaily
         run: ./scripts/validateData.mjs
diff --git a/scripts/queries.mjs b/scripts/queries.mjs
index 7de9668a..d062ac95 100755
--- a/scripts/queries.mjs
+++ b/scripts/queries.mjs
@@ -10,9 +10,8 @@ export const getQuery = (entity, filters) => {
 
   const queries = {
     vaultManagerGovernances: `query {
-          vaultManagerGovernances  {
+          vaultManagerGovernances ${filterString} {
               nodes {
-              blockHeight
                 id
                 debtLimit
                 interestRateDenominator
@@ -29,9 +28,8 @@ export const getQuery = (entity, filters) => {
           }
       }`,
     vaultManagerMetrics: `query {
-          vaultManagerMetrics  {
+          vaultManagerMetrics ${filterString} {
               nodes {
-              blockHeight
                 id
                 liquidatingCollateralBrand
                 liquidatingCollateralValue
@@ -54,7 +52,7 @@ export const getQuery = (entity, filters) => {
           }
       }`,
     vaultManagerMetricsDailies: `query {
-          vaultManagerMetricsDailies  {
+          vaultManagerMetricsDailies ${filterString} {
               nodes {
                 path
                 liquidatingCollateralBrand
@@ -79,7 +77,7 @@ export const getQuery = (entity, filters) => {
           }
       }`,
     reserveMetrics: `query {
-          reserveMetrics  {
+          reserveMetrics ${filterString} {
               nodes {
                 id
                 shortfallBalance
@@ -89,7 +87,7 @@ export const getQuery = (entity, filters) => {
           }
       }`,
     reserveAllocationMetrics: `query {
-          reserveAllocationMetrics  {
+          reserveAllocationMetrics ${filterString} {
               nodes {
                 id
                 denom
@@ -99,7 +97,7 @@ export const getQuery = (entity, filters) => {
           }
       }`,
     reserveAllocationMetricsDailies: `query {
-          reserveAllocationMetricsDailies  {
+          reserveAllocationMetricsDailies ${filterString} {
               nodes {
                 denom
                 key
diff --git a/scripts/validateData.mjs b/scripts/validateData.mjs
index 896d628a..62b47b92 100755
--- a/scripts/validateData.mjs
+++ b/scripts/validateData.mjs
@@ -35,7 +35,7 @@ try {
   console.log('Node:', nodes);
 
   for (const key of Object.keys(expectations[entity])) {
-    // equal(nodes[0]?.[key], expectations[entity][key]);
+    equal(nodes[0]?.[key], expectations[entity][key]);
   }
 } catch (error) {
   console.error('Error:', error);