diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json
index 2878732969..c78b305e82 100644
--- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json
+++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json
@@ -54,7 +54,7 @@
           "Parts": [
             {
               "CosineScore": [
-                0.9257855415344238
+                0.9257858991622925
               ],
               "QueryPart": "male population",
               "SV": [
@@ -63,8 +63,8 @@
             },
             {
               "CosineScore": [
-                0.9296979904174805,
-                0.8847434520721436
+                0.9296978712081909,
+                0.884743332862854
               ],
               "QueryPart": "female population",
               "SV": [
@@ -80,7 +80,7 @@
           "Parts": [
             {
               "CosineScore": [
-                0.9117770791053772
+                0.9117770195007324
               ],
               "QueryPart": "male population female",
               "SV": [
@@ -89,8 +89,8 @@
             },
             {
               "CosineScore": [
-                0.887420117855072,
-                0.8723466396331787
+                0.8874201774597168,
+                0.8723466992378235
               ],
               "QueryPart": "population",
               "SV": [
@@ -108,7 +108,7 @@
               "CosineScore": [
                 0.8034241199493408,
                 0.8017654418945312,
-                0.7751556634902954,
+                0.775155782699585,
                 0.7698014974594116,
                 0.7586972713470459
               ],
@@ -123,7 +123,7 @@
             },
             {
               "CosineScore": [
-                0.9170327186584473
+                0.9170328378677368
               ],
               "QueryPart": "population female population",
               "SV": [
diff --git a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json
index 082464682f..cafa1353d0 100644
--- a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json
+++ b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json
@@ -46,11 +46,11 @@
           "Parts": [
             {
               "CosineScore": [
-                0.7526574730873108,
-                0.7335996031761169,
-                0.7317347526550293,
-                0.7282766103744507,
-                0.72101229429245,
+                0.752657413482666,
+                0.7335996627807617,
+                0.7317348718643188,
+                0.7282766699790955,
+                0.7210124135017395,
                 0.7188708782196045,
                 0.7138628363609314,
                 0.7071599960327148
@@ -95,7 +95,7 @@
             },
             {
               "CosineScore": [
-                0.9999996423721313
+                0.9999995827674866
               ],
               "QueryPart": "blood pressure",
               "SV": [
diff --git a/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json
index 9c1cc45cea..96319f622c 100644
--- a/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json
+++ b/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json
@@ -57,16 +57,16 @@
           "Parts": [
             {
               "CosineScore": [
-                0.8084912300109863,
+                0.8084913492202759,
                 0.8080331683158875,
-                0.8044112920761108,
-                0.7984198331832886,
-                0.7966946959495544,
-                0.791584849357605,
-                0.7901858687400818,
-                0.786588728427887,
+                0.8044112324714661,
+                0.7984197735786438,
+                0.7966947555541992,
+                0.7915847301483154,
+                0.7901859283447266,
+                0.7865886092185974,
                 0.7779486775398254,
-                0.7773175239562988,
+                0.777317464351654,
                 0.7629759907722473
               ],
               "QueryPart": "number poor hispanic",
@@ -86,8 +86,8 @@
             },
             {
               "CosineScore": [
-                0.8318259119987488,
-                0.8029923439025879
+                0.8318256735801697,
+                0.8029924631118774
               ],
               "QueryPart": "women phd",
               "SV": [
@@ -103,7 +103,7 @@
           "Parts": [
             {
               "CosineScore": [
-                0.8433718085289001,
+                0.8433718681335449,
                 0.8265039920806885
               ],
               "QueryPart": "number poor hispanic women",
@@ -114,11 +114,11 @@
             },
             {
               "CosineScore": [
-                0.7646969556808472,
-                0.7476687431335449,
+                0.7646968364715576,
+                0.7476688027381897,
                 0.7377066612243652,
-                0.7362766861915588,
-                0.7305880784988403
+                0.7362765669822693,
+                0.7305881977081299
               ],
               "QueryPart": "phd",
               "SV": [
@@ -137,7 +137,7 @@
           "Parts": [
             {
               "CosineScore": [
-                0.7890844941139221
+                0.7890843152999878
               ],
               "QueryPart": "number poor",
               "SV": [
diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json
index 6232b91af8..e500eebdac 100644
--- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json
+++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json
@@ -65,10 +65,10 @@
           "Parts": [
             {
               "CosineScore": [
-                0.794236958026886,
-                0.7929013967514038,
-                0.7586168050765991,
-                0.758395791053772
+                0.7942368984222412,
+                0.7929012775421143,
+                0.7586166858673096,
+                0.7583957314491272
               ],
               "QueryPart": "show climate",
               "SV": [
@@ -80,7 +80,7 @@
             },
             {
               "CosineScore": [
-                0.8665127754211426
+                0.8665127158164978
               ],
               "QueryPart": "change drought",
               "SV": [
diff --git a/server/integration_tests/test_data/detection_translate_chinese/chart_config.json b/server/integration_tests/test_data/detection_translate_chinese/chart_config.json
index 9e7293495c..bbfe2c80a5 100644
--- a/server/integration_tests/test_data/detection_translate_chinese/chart_config.json
+++ b/server/integration_tests/test_data/detection_translate_chinese/chart_config.json
@@ -28,12 +28,8 @@
   "properties": [],
   "sessionId": "007_999999999",
   "variables": [
-    "Count_CriminalActivities_MotorVehicleTheft",
     "Count_CriminalActivities_LarcenyTheft",
-    "Count_CriminalActivities_Robbery",
-    "Count_CriminalActivities_Burglary",
-    "Count_CriminalActivities_PropertyCrime",
-    "Count_CriminalActivities_CombinedCrime",
-    "dc/topic/Crime"
+    "dc/topic/Crime",
+    "Count_CriminalActivities_MotorVehicleTheft"
   ]
 }
\ No newline at end of file
diff --git a/server/integration_tests/test_data/e2e_edge_cases2/povertyvs.unemploymentrateindistrictsoftamilnadu/chart_config.json b/server/integration_tests/test_data/e2e_edge_cases2/povertyvs.unemploymentrateindistrictsoftamilnadu/chart_config.json
index b053c625e5..9af6fd1c7c 100644
--- a/server/integration_tests/test_data/e2e_edge_cases2/povertyvs.unemploymentrateindistrictsoftamilnadu/chart_config.json
+++ b/server/integration_tests/test_data/e2e_edge_cases2/povertyvs.unemploymentrateindistrictsoftamilnadu/chart_config.json
@@ -31,7 +31,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population Below Poverty Line"
           },
           {
diff --git a/server/integration_tests/test_data/e2e_high_sv_threshold/chart_config.json b/server/integration_tests/test_data/e2e_high_sv_threshold/chart_config.json
index a78e115aac..fc7fd99909 100644
--- a/server/integration_tests/test_data/e2e_high_sv_threshold/chart_config.json
+++ b/server/integration_tests/test_data/e2e_high_sv_threshold/chart_config.json
@@ -62,7 +62,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Count of Mortality Event: 1 Years or Less in Counties of Massachusetts"
           },
           {
@@ -83,7 +82,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Causes of Infant Mortality"
           },
           {
@@ -116,7 +114,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in Counties of Massachusetts"
           },
           {
@@ -149,7 +146,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts"
           },
           {
diff --git a/server/integration_tests/test_data/e2e_india_demo/howdoesliteracyratecomparetopovertyinindia/chart_config.json b/server/integration_tests/test_data/e2e_india_demo/howdoesliteracyratecomparetopovertyinindia/chart_config.json
index be3e6d0b80..9425dcb40d 100644
--- a/server/integration_tests/test_data/e2e_india_demo/howdoesliteracyratecomparetopovertyinindia/chart_config.json
+++ b/server/integration_tests/test_data/e2e_india_demo/howdoesliteracyratecomparetopovertyinindia/chart_config.json
@@ -23,7 +23,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Literate vs. Population Below poverty line"
           },
           {
@@ -56,7 +55,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Literate in Administrative Area 1 Places of India"
           },
           {
@@ -89,7 +87,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population Below Poverty Line in Administrative Area 1 Places of India"
           },
           {
@@ -111,7 +108,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Illiterate vs. Population Below poverty line (Per Capita)"
           },
           {
@@ -195,7 +191,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Literate vs. Population Below poverty line (Per Capita)"
           },
           {
@@ -217,7 +212,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Illiterate vs. Population Below poverty line"
           }
         ],
diff --git a/server/integration_tests/test_data/e2e_india_demo/howdoestheliteracyratecompare/chart_config.json b/server/integration_tests/test_data/e2e_india_demo/howdoestheliteracyratecompare/chart_config.json
index bbe01500ef..c0e50c2620 100644
--- a/server/integration_tests/test_data/e2e_india_demo/howdoestheliteracyratecompare/chart_config.json
+++ b/server/integration_tests/test_data/e2e_india_demo/howdoestheliteracyratecompare/chart_config.json
@@ -36,7 +36,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Literate"
           },
           {
@@ -71,7 +70,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Illiterate"
           },
           {
@@ -139,7 +137,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Literate, Urban"
           },
           {
@@ -174,7 +171,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Male, Literate"
           },
           {
@@ -209,7 +205,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Literate, Rural"
           },
           {
@@ -244,7 +239,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Illiterate, Urban"
           },
           {
@@ -279,7 +273,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Female, Literate"
           },
           {
@@ -314,7 +307,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Male, Illiterate"
           },
           {
@@ -349,7 +341,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Illiterate, Rural"
           },
           {
@@ -384,7 +375,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Female, Illiterate"
           },
           {
@@ -419,7 +409,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Houseless, Literate"
           },
           {
@@ -454,7 +443,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Houseless, Illiterate"
           },
           {
@@ -489,7 +477,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Houseless, Literate, Urban"
           },
           {
@@ -524,7 +511,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Houseless, Illiterate, Urban"
           },
           {
@@ -559,7 +545,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population: Houseless, Literate, Rural"
           }
         ],
diff --git a/server/integration_tests/test_data/e2e_india_demo/whichstatesinindiahavethehighestpovertylevelspercapita/chart_config.json b/server/integration_tests/test_data/e2e_india_demo/whichstatesinindiahavethehighestpovertylevelspercapita/chart_config.json
index 1d3bbdaca1..6e11904ead 100644
--- a/server/integration_tests/test_data/e2e_india_demo/whichstatesinindiahavethehighestpovertylevelspercapita/chart_config.json
+++ b/server/integration_tests/test_data/e2e_india_demo/whichstatesinindiahavethehighestpovertylevelspercapita/chart_config.json
@@ -298,63 +298,9 @@
                 "tiles": [
                   {
                     "statVarKey": [
-                      "sdg/SI_POV_EMP1.AGE--Y15T24",
-                      "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--F",
-                      "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--M"
+                      "sdg/SI_POV_EMP1.AGE--Y_GE15"
                     ],
-                    "title": "Employed Population 15 to 24 Years Old Below International Poverty Line, by Sex (%) in India",
-                    "type": "LINE"
-                  }
-                ]
-              }
-            ],
-            "title": "Employed Population 15 to 24 Years Old Below International Poverty Line, by Sex (%)"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "sdg/SI_POV_EMP1.AGE--Y_GE15",
-                      "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--F",
-                      "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--M"
-                    ],
-                    "title": "Employed Population 15 Years Old and Over Below International Poverty Line, by Sex (%) in India",
-                    "type": "LINE"
-                  }
-                ]
-              }
-            ],
-            "title": "Employed Population 15 Years Old and Over Below International Poverty Line, by Sex (%)"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "sdg/SI_POV_EMP1.AGE--Y_GE25",
-                      "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--F",
-                      "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--M"
-                    ],
-                    "title": "Employed Population 25 Years Old and Over Below International Poverty Line, by Sex (%) in India",
-                    "type": "LINE"
-                  }
-                ]
-              }
-            ],
-            "title": "Employed Population 25 Years Old and Over Below International Poverty Line, by Sex (%)"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Amount_EconomicActivity_GrossDomesticProduction_Nominal_PerCapita"
-                    ],
-                    "title": "Nominal GDP Per Capita in India",
+                    "title": "Employed Population Aged 15 or Over Below International Poverty Line in India",
                     "type": "LINE"
                   }
                 ]
@@ -362,56 +308,21 @@
               {
                 "tiles": [
                   {
-                    "description": "Nominal GDP Per Capita in India",
+                    "description": "Employed Population Aged 15 or Over Below International Poverty Line in India",
                     "statVarKey": [
-                      "Amount_EconomicActivity_GrossDomesticProduction_Nominal_PerCapita"
+                      "sdg/SI_POV_EMP1.AGE--Y_GE15"
                     ],
-                    "title": "Nominal GDP Per Capita in India",
+                    "title": "Employed Population Aged 15 or Over Below International Poverty Line in India",
                     "type": "HIGHLIGHT"
                   }
                 ]
               }
             ],
-            "title": "Nominal GDP Per Capita"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Amount_EconomicActivity_GrossNationalIncome_PurchasingPowerParity_PerCapita"
-                    ],
-                    "title": "Gross National Income Based on Purchasing Power Parity Per Capita in India",
-                    "type": "LINE"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "description": "Gross National Income Based on Purchasing Power Parity Per Capita in India",
-                    "statVarKey": [
-                      "Amount_EconomicActivity_GrossNationalIncome_PurchasingPowerParity_PerCapita"
-                    ],
-                    "title": "Gross National Income Based on Purchasing Power Parity Per Capita in India",
-                    "type": "HIGHLIGHT"
-                  }
-                ]
-              }
-            ],
-            "title": "Gross National Income Based on Purchasing Power Parity Per Capita"
+            "footnote": "Includes data from the following sources: source = ILO modelled estimates, nov.2022.",
+            "title": "Employed Population Aged 15 or Over Below International Poverty Line"
           }
         ],
         "statVarSpec": {
-          "Amount_EconomicActivity_GrossDomesticProduction_Nominal_PerCapita": {
-            "name": "Nominal GDP Per Capita",
-            "statVar": "Amount_EconomicActivity_GrossDomesticProduction_Nominal_PerCapita"
-          },
-          "Amount_EconomicActivity_GrossNationalIncome_PurchasingPowerParity_PerCapita": {
-            "name": "Gross National Income Based on Purchasing Power Parity Per Capita",
-            "statVar": "Amount_EconomicActivity_GrossNationalIncome_PurchasingPowerParity_PerCapita"
-          },
           "Count_Person_BelowPovertyLevelInThePast12Months": {
             "name": "Population Below poverty line",
             "statVar": "Count_Person_BelowPovertyLevelInThePast12Months"
@@ -460,41 +371,9 @@
             "name": "Urban Population Below International Poverty Line",
             "statVar": "sdg/SI_POV_DAY1.URBANISATION--U"
           },
-          "sdg/SI_POV_EMP1.AGE--Y15T24": {
-            "name": "Employed Population Age 15 to 24 Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y15T24"
-          },
-          "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--F": {
-            "name": "Employed Women Age 15 to 24 Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--F"
-          },
-          "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--M": {
-            "name": "Employed Men Age 14 to 24 Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--M"
-          },
           "sdg/SI_POV_EMP1.AGE--Y_GE15": {
             "name": "Employed Population Aged 15 or Over Below International Poverty Line",
             "statVar": "sdg/SI_POV_EMP1.AGE--Y_GE15"
-          },
-          "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--F": {
-            "name": "Employed Women Aged 15 or Over Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--F"
-          },
-          "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--M": {
-            "name": "Employed Men Aged 15 or Over Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--M"
-          },
-          "sdg/SI_POV_EMP1.AGE--Y_GE25": {
-            "name": "Employed Population Aged 25 or Over Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y_GE25"
-          },
-          "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--F": {
-            "name": "Employed Women Aged 25 or Over Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--F"
-          },
-          "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--M": {
-            "name": "Employed Men Aged 25 or Over Below International Poverty Line",
-            "statVar": "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--M"
           }
         }
       }
@@ -848,23 +727,11 @@
           "sdg/SI_POV_DAY1.URBANISATION--U"
         ]
       },
-      "sdg/SI_POV_EMP1.AGE--Y15T24": {
-        "sdg_sex": [
-          "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--F",
-          "sdg/SI_POV_EMP1.AGE--Y15T24__SEX--M"
-        ]
-      },
       "sdg/SI_POV_EMP1.AGE--Y_GE15": {
         "sdg_sex": [
           "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--F",
           "sdg/SI_POV_EMP1.AGE--Y_GE15__SEX--M"
         ]
-      },
-      "sdg/SI_POV_EMP1.AGE--Y_GE25": {
-        "sdg_sex": [
-          "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--F",
-          "sdg/SI_POV_EMP1.AGE--Y_GE25__SEX--M"
-        ]
       }
     },
     "mainTopics": [
diff --git a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json
index d15f3e6c0a..5ef8a767ca 100644
--- a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json
+++ b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json
@@ -115,7 +115,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period)"
           },
           {
@@ -148,7 +147,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts"
           },
           {
@@ -206,7 +204,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Mortality Events (1 Years or Less): Diseases of the Circulatory System"
           },
           {
@@ -236,7 +233,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities)"
           },
           {
@@ -269,7 +265,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities) in Counties of Massachusetts"
           }
         ],
diff --git a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatisthepovertyrateinseattle/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatisthepovertyrateinseattle/chart_config.json
index e37e40b845..84f31e7a88 100644
--- a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatisthepovertyrateinseattle/chart_config.json
+++ b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatisthepovertyrateinseattle/chart_config.json
@@ -31,7 +31,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Population Below Poverty Line"
           },
           {
@@ -61,7 +60,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Below Poverty Line (Two or More Races)"
           },
           {
@@ -91,7 +89,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Males in Poverty (In Last Year)"
           },
           {
@@ -121,7 +118,6 @@
               }
             ],
             "denom": "Count_Person",
-            "startWithDenom": true,
             "title": "Women Below Poverty Line"
           }
         ],
diff --git a/server/integration_tests/test_data/e2e_us_demo/howdoeshouseholdincomecomparewithratesofdiabetesinusacounties/chart_config.json b/server/integration_tests/test_data/e2e_us_demo/howdoeshouseholdincomecomparewithratesofdiabetesinusacounties/chart_config.json
index 491e53109d..45903ac7b8 100644
--- a/server/integration_tests/test_data/e2e_us_demo/howdoeshouseholdincomecomparewithratesofdiabetesinusacounties/chart_config.json
+++ b/server/integration_tests/test_data/e2e_us_demo/howdoeshouseholdincomecomparewithratesofdiabetesinusacounties/chart_config.json
@@ -137,57 +137,6 @@
             ],
             "title": "Average Income for Family Households in Counties of United States"
           },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "scatterTileSpec": {
-                      "highlightTopRight": true
-                    },
-                    "statVarKey": [
-                      "Median_Income_Household_FamilyHousehold_scatter",
-                      "Percent_Person_WithDiabetes_scatter"
-                    ],
-                    "title": "Median Family Household Income (${yDate}) Vs. Diabetes (${xDate}) in Counties of United States",
-                    "type": "SCATTER"
-                  }
-                ]
-              }
-            ],
-            "title": "Median Family Household Income vs. Diabetes"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Median_Income_Household_FamilyHousehold"
-                    ],
-                    "title": "Median Family Household Income in Counties of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Median_Income_Household_FamilyHousehold"
-                    ],
-                    "title": "Median Family Household Income in Counties of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "title": "Median Family Household Income in Counties of United States"
-          },
           {
             "columns": [
               {
@@ -238,108 +187,6 @@
               }
             ],
             "title": "Household Median Income in Counties of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "scatterTileSpec": {
-                      "highlightTopRight": true
-                    },
-                    "statVarKey": [
-                      "Median_Income_Household_MarriedCoupleFamilyHousehold_scatter",
-                      "Percent_Person_WithDiabetes_scatter"
-                    ],
-                    "title": "Median Married Couple Family Household Income (${yDate}) Vs. Diabetes (${xDate}) in Counties of United States",
-                    "type": "SCATTER"
-                  }
-                ]
-              }
-            ],
-            "title": "Median Married Couple Family Household Income vs. Diabetes"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Median_Income_Household_MarriedCoupleFamilyHousehold"
-                    ],
-                    "title": "Median Married Couple Family Household Income in Counties of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Median_Income_Household_MarriedCoupleFamilyHousehold"
-                    ],
-                    "title": "Median Married Couple Family Household Income in Counties of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "title": "Median Married Couple Family Household Income in Counties of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "scatterTileSpec": {
-                      "highlightTopRight": true
-                    },
-                    "statVarKey": [
-                      "Median_Income_Household_NonfamilyHousehold_scatter",
-                      "Percent_Person_WithDiabetes_scatter"
-                    ],
-                    "title": "Nonfamily Household Median Income (${yDate}) Vs. Diabetes (${xDate}) in Counties of United States",
-                    "type": "SCATTER"
-                  }
-                ]
-              }
-            ],
-            "title": "Nonfamily Household Median Income vs. Diabetes"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Median_Income_Household_NonfamilyHousehold"
-                    ],
-                    "title": "Nonfamily Household Median Income in Counties of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Median_Income_Household_NonfamilyHousehold"
-                    ],
-                    "title": "Nonfamily Household Median Income in Counties of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "title": "Nonfamily Household Median Income in Counties of United States"
           }
         ],
         "statVarSpec": {
@@ -365,33 +212,6 @@
             "name": "Household Median Income",
             "statVar": "Median_Income_Household"
           },
-          "Median_Income_Household_FamilyHousehold": {
-            "name": "Median Family Household Income",
-            "statVar": "Median_Income_Household_FamilyHousehold"
-          },
-          "Median_Income_Household_FamilyHousehold_scatter": {
-            "name": "Median Family Household Income",
-            "noPerCapita": true,
-            "statVar": "Median_Income_Household_FamilyHousehold"
-          },
-          "Median_Income_Household_MarriedCoupleFamilyHousehold": {
-            "name": "Median Married Couple Family Household Income",
-            "statVar": "Median_Income_Household_MarriedCoupleFamilyHousehold"
-          },
-          "Median_Income_Household_MarriedCoupleFamilyHousehold_scatter": {
-            "name": "Median Married Couple Family Household Income",
-            "noPerCapita": true,
-            "statVar": "Median_Income_Household_MarriedCoupleFamilyHousehold"
-          },
-          "Median_Income_Household_NonfamilyHousehold": {
-            "name": "Nonfamily Household Median Income",
-            "statVar": "Median_Income_Household_NonfamilyHousehold"
-          },
-          "Median_Income_Household_NonfamilyHousehold_scatter": {
-            "name": "Nonfamily Household Median Income",
-            "noPerCapita": true,
-            "statVar": "Median_Income_Household_NonfamilyHousehold"
-          },
           "Median_Income_Household_scatter": {
             "name": "Household Median Income",
             "noPerCapita": true,
@@ -795,13 +615,6 @@
     },
     "childTopics": [],
     "exploreMore": {
-      "Mean_Income_Household": {
-        "householdType": [
-          "Mean_Income_Household_FamilyHousehold",
-          "Mean_Income_Household_MarriedCoupleFamilyHousehold",
-          "Mean_Income_Household_NonfamilyHousehold"
-        ]
-      },
       "Median_Income_Household": {
         "benefitsStatus": [
           "Median_Income_Household_WithFoodStampsInThePast12Months",
diff --git a/shared/lib/constants.py b/shared/lib/constants.py
index 50ea1333e4..bb414bcbcc 100644
--- a/shared/lib/constants.py
+++ b/shared/lib/constants.py
@@ -153,167 +153,198 @@
 
 # Note: These heuristics should be revisited if we change
 # query preprocessing (e.g. stopwords, stemming)
-QUERY_CLASSIFICATION_HEURISTICS: Dict[str, Union[List[str], Dict[
-    str, List[str]]]] = {
-        "Ranking": {
-            "High": [
-                "most",
-                "(?<!bottom to )top",
-                "best",  # leaving here for backwards-compatibility
-                "(?<!lowest to )highest",
-                "high",
-                "largest",
-                "biggest",
-                "greatest",
-                "strongest",
-                "richest",
-                "sickest",
-                "illest",
-                "oldest",
-                "major",  # as in 'major storms'
-                "descending",
-                "top to bottom",
-                "highest to lowest",
-            ],
-            "Low": [
-                "least",
-                "(?<!top to )bottom",
-                "worst",  # leaving here for backwards-compatibility
-                "(?<!highest to )lowest",
-                "low",
-                "smallest",
-                "weakest",
-                "youngest",
-                "poorest",
-                "healthiest",
-                "ascending",
-                "bottom to top",
-                "lowest to highest",
-            ],
-            "Best": ["best",],
-            "Worst": ["worst",],
-            "Extreme": ["extremes?", "impact"]
-        },
-        "Comparison": [
-            "compare(s|d)?",
-            "comparison",
-            "(is|has|have)( a| the)? \w+er",
-            # WARNING: These will conflate with Correlation
-            "vs",
-            "versus",
+QUERY_CLASSIFICATION_HEURISTICS: Dict[str, Union[List[str], Dict[str, List[str]]]] = {
+    "Ranking": {
+        "High": [
+            "most",
+            "(?<!bottom to )top",
+            "best",  # leaving here for backwards-compatibility
+            "(?<!lowest to )highest",
+            "high",
+            "largest",
+            "biggest",
+            "greatest",
+            "strongest",
+            "richest",
+            "sickest",
+            "illest",
+            "oldest",
+            "major",  # as in 'major storms'
+            "descending",
+            "top to bottom",
+            "highest to lowest",
         ],
-        "Correlation": [
-            "correlate",
-            "correlated",
-            "correlation",
-            "relationship to",
-            "relationship with",
-            "relationship between",
-            "related to",
-            "related with",
-            "related between",
-            # WARNING: These will conflate with Comparison
-            "vs",
-            "versus",
+        "Low": [
+            "least",
+            "(?<!top to )bottom",
+            "worst",  # leaving here for backwards-compatibility
+            "(?<!highest to )lowest",
+            "low",
+            "smallest",
+            "weakest",
+            "youngest",
+            "poorest",
+            "healthiest",
+            "ascending",
+            "bottom to top",
+            "lowest to highest",
         ],
-        "Event": {
-            "Fire": ["(wild)?fires?",],
-            "Drought": ["droughts?",],
-            "Flood": ["floods?",],
-            "Cyclone": [
-                "tropical storms?",
-                "cyclones?",
-                "hurricanes?",
-                "typhoons?",
-            ],
-            "ExtremeHeat": [
-                "(extreme )?heat",
-                "extreme(ly)? hot",
-            ],
-            "ExtremeCold": ["(extreme(ly)? )?cold",],
-            "WetBulb": ["wet(\W?)bulb",],
-            "Earthquake": ["earthquakes?",]
-        },
-        "TimeDelta": {
-            "Increase": [
-                "grow(n|th|s)?",
-                "grew",
-                "gain(s)?",
-                "increase(d|s)?",
-                "increasing",
-                "surge(d|s)?",
-                "surging",
-                "rise(d|n|s)?",
-                "rising",
-            ],
-            "Decrease": [
-                "decrease(d|s)?",
-                "decreasing",
-                "shr(ank|ink|unk)(ing)?",
-                "reduce(d|s)?",
-                "reduc(ing|tion)",
-                "decline(d|s)?",
-                "declining",
-                "plummet(ed|ing|s)?",
-                "fall(en|s)?",
-                "drop(ped|s)?",
-                "loss(es)?",
-            ],
-            "Change": ["change(s|d|) (over|with) time"]
-        },
-        "Superlative": {
-            "Big": ["big", "bigger", "biggest"],
-            "Small": ["small", "bigger", "smallest"],
-            "Rich": ["rich", "richer", "richest"],
-            "Poor": ["poor", "poorer", "poorest"],
-            "List": ["list( of|)"]
-        },
-        "Overview": ["tell me (more )?about",],
-        # Hint for potential reference to answer-places, to be used
-        # together with ContainedInPlace.
-        "AnswerPlacesReference": ["these", "those"],
-        "PerCapita": [
-            "fraction", "percent", "percentage", "per capita", "percapita",
-            "per person", "rate", "rates"
+        "Best": [
+            "best",
         ],
-        "Temporal": [
-            # Day of week
-            "monday",
-            "tuesday",
-            "wednesday",
-            "thursday",
-            "friday",
-            "saturday",
-            "sunday",
-            # Month of year
-            "january",
-            "february",
-            "march",
-            "april",
-            "may",
-            "june",
-            "july",
-            "august",
-            "september",
-            "october",
-            "november",
-            "december",
-            # Season
-            "spring",
-            "summer",
-            "winter",
-            "autumn",
-            # Others
-            "today",
-            "yesterday",
-            "tomorrow",
-        ]
-    }
+        "Worst": [
+            "worst",
+        ],
+        "Extreme": ["extremes?", "impact"]
+    },
+    "Comparison": [
+        "compare(s|d)?",
+        "comparison",
+        "(is|has|have)( a| the)? \w+er",
+        # WARNING: These will conflate with Correlation
+        "vs",
+        "versus",
+    ],
+    "Correlation": [
+        "correlate",
+        "correlated",
+        "correlation",
+        "relationship to",
+        "relationship with",
+        "relationship between",
+        "related to",
+        "related with",
+        "related between",
+        # WARNING: These will conflate with Comparison
+        "vs",
+        "versus",
+    ],
+    "Event": {
+        "Fire": [
+            "(wild)?fires?",
+        ],
+        "Drought": ["droughts?",
+                   ],
+        "Flood": [
+            "floods?",
+        ],
+        "Cyclone": [
+            "tropical storms?",
+            "cyclones?",
+            "hurricanes?",
+            "typhoons?",
+        ],
+        "ExtremeHeat": [
+            "(extreme )?heat",
+            "extreme(ly)? hot",
+        ],
+        "ExtremeCold": [
+            "(extreme(ly)? )?cold",
+        ],
+        "WetBulb": ["wet(\W?)bulb",],
+        "Earthquake": ["earthquakes?",]
+    },
+    "TimeDelta": {
+        "Increase": [
+            "grow(n|th|s)?",
+            "grew",
+            "gain(s)?",
+            "increase(d|s)?",
+            "increasing",
+            "surge(d|s)?",
+            "surging",
+            "rise(d|n|s)?",
+            "rising",
+        ],
+        "Decrease": [
+            "decrease(d|s)?",
+            "decreasing",
+            "shr(ank|ink|unk)(ing)?",
+            "reduce(d|s)?",
+            "reduc(ing|tion)",
+            "decline(d|s)?",
+            "declining",
+            "plummet(ed|ing|s)?",
+            "fall(en|s)?",
+            "drop(ped|s)?",
+            "loss(es)?",
+        ],
+        "Change": ["change(s|d|) (over|with) time"]
+    },
+    "Superlative": {
+        "Big": ["big", "bigger", "biggest"
+               ],
+        "Small": [
+            "small",
+            "bigger",
+            "smallest"
+        ],
+        "Rich": [
+            "rich",
+            "richer",
+            "richest"
+        ],
+        "Poor": [
+            "poor",
+            "poorer",
+            "poorest"
+        ],
+        "List": ["list( of|)"]
+    },
+    "Overview": ["tell me (more )?about",],
+    # Hint for potential reference to answer-places, to be used
+    # together with ContainedInPlace.
+    "AnswerPlacesReference":
+        ["these",
+         "those"],
+    "PerCapita": [
+        "fraction",
+        "percent",
+        "percentage",
+        "per capita",
+        "percapita",
+        "per person",
+        # remove "rate" if is not followed by certain words (used as one metric)
+        "\brate\b(?!\s*(birth|change|death|exchange|fertility|literacy|mortality|participation|unemployment|withdrawal)\s+rate)",
+        "rates"
+    ],
+    "Temporal": [
+        # Day of week
+        "monday",
+        "tuesday",
+        "wednesday",
+        "thursday",
+        "friday",
+        "saturday",
+        "sunday",
+        # Month of year
+        "january",
+        "february",
+        "march",
+        "april",
+        "may",
+        "june",
+        "july",
+        "august",
+        "september",
+        "october",
+        "november",
+        "december",
+        # Season
+        "spring",
+        "summer",
+        "winter",
+        "autumn",
+        # Others
+        "today",
+        "yesterday",
+        "tomorrow",
+    ]
+}
 
 # We do not want to strip words from events / superlatives / temporal
 # since we want those to match SVs too!
-HEURISTIC_TYPES_IN_VARIABLES = frozenset(
-    ["Event", "Superlative", "Temporal", "PerCapita"])
+HEURISTIC_TYPES_IN_VARIABLES = frozenset(["Event", "Superlative", "Temporal"])
 
 PLACE_TYPE_TO_PLURALS: Dict[str, str] = {
     "place": "places",
diff --git a/tools/nl/embeddings/input/base/sheets_svs.csv b/tools/nl/embeddings/input/base/sheets_svs.csv
index a31d59bb37..48a1a0c422 100644
--- a/tools/nl/embeddings/input/base/sheets_svs.csv
+++ b/tools/nl/embeddings/input/base/sheets_svs.csv
@@ -2828,7 +2828,7 @@ CumulativeCount_MedicalConditionIncident_COVID_19_PatientDeceased,Total COVID-19
 CumulativeCount_MedicalTest_ConditionCOVID_19,Total COVID-19 tests performed
 CumulativeCount_Vaccine_COVID_19_Administered,Total COVID-19 vaccines administered
 DewPointTemperature_SurfaceLevel,Surface-Level Dew Point Temperature
-ExchangeRate_Currency_Standardized,exchange rates of Standard Local Currency (SLC) per US dollar
+ExchangeRate_Currency_Standardized,exchange rate of Standard Local Currency (SLC) per US dollar
 Expenses_Farm,total farm expenses
 FemaCommunityResilience_NaturalHazardImpact,FEMA Community Resilience to Natural Hazard Impact
 FemaNaturalHazardRiskIndex_NaturalHazardImpact,FEMA National Risk Index for Natural Hazard Impact