diff --git a/deploy/nl/catalog.yaml b/deploy/nl/catalog.yaml
index 1b9f155950..788166b15c 100644
--- a/deploy/nl/catalog.yaml
+++ b/deploy/nl/catalog.yaml
@@ -90,7 +90,7 @@ indexes:
   base_uae_mem:
     store_type: MEMORY
     source_path: ../../tools/nl/embeddings/input/base
-    embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_15_08_44_06/embeddings.csv
+    embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_16_10_33_10/embeddings.csv
     model: uae-large-v1-model
     healthcheck_query: "Life expectancy"
   base_mistral_mem:
diff --git a/import b/import
index b2616a5040..4eae5da5b2 160000
--- a/import
+++ b/import
@@ -1 +1 @@
-Subproject commit b2616a504051885362725eabefc2060e9a5636cc
+Subproject commit 4eae5da5b266ae13e8f8206ce27c84f88115eb43
diff --git a/mixer b/mixer
index 9ebe7febee..bb5d14e231 160000
--- a/mixer
+++ b/mixer
@@ -1 +1 @@
-Subproject commit 9ebe7febee09f8d8046b8bf0554b2d7141220289
+Subproject commit bb5d14e2312227febdbdeadfb4b8b785d93b2d75
diff --git a/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json b/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json
index f52d85dd2c..caeb56ce14 100644
--- a/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json
+++ b/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json
@@ -235,6 +235,214 @@
             "description": "Predicted max temperature with 95% chance, at least once in the year, according to a CMIP6 ensemble model as per SSP 585 (pessimistic) scenario.",
             "footnote": "SSP585 is a pessimistic pathway. It is an update to RCP 8.5 with an additional radiative forcing of 8.5 W/m\u00b2. RCP 8.5 is more likely than not to result in global temperature rise between 3 \u00b0C and 12.6 \u00b0C by 2100.",
             "title": "Max Temperature (\u00b0C) Once in Year With 95% Chance: SP585 in Counties of California"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "rankingTileSpec": {
+                      "rankingCount": 10,
+                      "showHighest": true
+                    },
+                    "statVarKey": [
+                      "Temperature"
+                    ],
+                    "title": "Temperature in a Location in Counties of California (${date})",
+                    "type": "RANKING"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Temperature"
+                    ],
+                    "title": "Temperature in a Location in Counties of California (${date})",
+                    "type": "MAP"
+                  }
+                ]
+              }
+            ],
+            "title": "Temperature in a Location in Counties of California"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Mean_Temperature"
+                    ],
+                    "title": "Mean Temperature in California",
+                    "type": "LINE"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "description": "Mean Temperature in California",
+                    "statVarKey": [
+                      "Mean_Temperature"
+                    ],
+                    "title": "Mean Temperature in California",
+                    "type": "HIGHLIGHT"
+                  }
+                ]
+              }
+            ],
+            "title": "Mean Temperature"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "rankingTileSpec": {
+                      "rankingCount": 10,
+                      "showHighest": true
+                    },
+                    "statVarKey": [
+                      "Mean_Temperature"
+                    ],
+                    "title": "Mean Temperature in Counties of California (${date})",
+                    "type": "RANKING"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Mean_Temperature"
+                    ],
+                    "title": "Mean Temperature in Counties of California (${date})",
+                    "type": "MAP"
+                  }
+                ]
+              }
+            ],
+            "title": "Mean Temperature in Counties of California"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Max_Temperature"
+                    ],
+                    "title": "Maximum Temperature in California",
+                    "type": "LINE"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "description": "Maximum Temperature in California",
+                    "statVarKey": [
+                      "Max_Temperature"
+                    ],
+                    "title": "Maximum Temperature in California",
+                    "type": "HIGHLIGHT"
+                  }
+                ]
+              }
+            ],
+            "title": "Maximum Temperature"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "rankingTileSpec": {
+                      "rankingCount": 10,
+                      "showHighest": true
+                    },
+                    "statVarKey": [
+                      "Max_Temperature"
+                    ],
+                    "title": "Maximum Temperature in Counties of California (${date})",
+                    "type": "RANKING"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Max_Temperature"
+                    ],
+                    "title": "Maximum Temperature in Counties of California (${date})",
+                    "type": "MAP"
+                  }
+                ]
+              }
+            ],
+            "title": "Maximum Temperature in Counties of California"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Min_Temperature"
+                    ],
+                    "title": "Min Temperature in California",
+                    "type": "LINE"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "description": "Min Temperature in California",
+                    "statVarKey": [
+                      "Min_Temperature"
+                    ],
+                    "title": "Min Temperature in California",
+                    "type": "HIGHLIGHT"
+                  }
+                ]
+              }
+            ],
+            "title": "Min Temperature"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "rankingTileSpec": {
+                      "rankingCount": 10,
+                      "showLowest": true
+                    },
+                    "statVarKey": [
+                      "Min_Temperature"
+                    ],
+                    "title": "Min Temperature in Counties of California (${date})",
+                    "type": "RANKING"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Min_Temperature"
+                    ],
+                    "title": "Min Temperature in Counties of California (${date})",
+                    "type": "MAP"
+                  }
+                ]
+              }
+            ],
+            "title": "Min Temperature in Counties of California"
           }
         ],
         "statVarSpec": {
@@ -270,6 +478,22 @@
             "name": "Max Temperature (\u00b0C) Once In Year With 95% Chance: SP585",
             "statVar": "MaxTemp_Daily_Hist_95PctProb_Greater_Atleast1DayAYear_CMIP6_Ensemble_SSP585"
           },
+          "Max_Temperature": {
+            "name": "Maximum Temperature",
+            "statVar": "Max_Temperature"
+          },
+          "Mean_Temperature": {
+            "name": "Mean Temperature",
+            "statVar": "Mean_Temperature"
+          },
+          "Min_Temperature": {
+            "name": "Min Temperature",
+            "statVar": "Min_Temperature"
+          },
+          "Temperature": {
+            "name": "Temperature in a Location",
+            "statVar": "Temperature"
+          },
           "ranking-DiffRelativeToAvg_1980_2010_MaxTemp_Daily_Hist_95PctProb_Greater_Atleast1DayADecade_CMIP6_Ensemble_SSP245": {
             "name": "SSP245 (intermediate), \u00b0C",
             "statVar": "DiffRelativeToAvg_1980_2010_MaxTemp_Daily_Hist_95PctProb_Greater_Atleast1DayADecade_CMIP6_Ensemble_SSP245"
diff --git a/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json b/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json
index 2910153aff..3e3fab2fee 100644
--- a/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json
+++ b/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json
@@ -11,28 +11,28 @@
   "sv_matching": {
     "CosineScore": [
       0.35510891675949097,
-      0.34608712792396545,
-      0.34525778889656067,
+      0.34608709812164307,
+      0.34525781869888306,
       0.34484589099884033,
-      0.3411365747451782,
-      0.3384982645511627,
-      0.3349902927875519,
-      0.33166080713272095,
+      0.34113654494285583,
+      0.3384983241558075,
+      0.33499041199684143,
+      0.3316609561443329,
       0.32600581645965576,
-      0.32424452900886536,
-      0.32060614228248596,
-      0.3142656087875366,
-      0.31276530027389526,
+      0.3242444396018982,
+      0.3206062316894531,
+      0.314265638589859,
+      0.3127653896808624,
       0.3126294016838074,
-      0.31250450015068054,
+      0.31250444054603577,
       0.31177398562431335,
-      0.31033891439437866,
-      0.3100748062133789,
-      0.3098834156990051,
-      0.30805402994155884,
+      0.3103390336036682,
+      0.3100748658180237,
+      0.3098834753036499,
+      0.3080539405345917,
       0.3074587285518646,
-      0.30719631910324097,
-      0.3039420545101166
+      0.3071962594985962,
+      0.3039422035217285
     ],
     "MultiSV": {},
     "Query": "what is the phylum of",
@@ -65,33 +65,33 @@
   "props_matching": {
     "CosineScore": [
       1.0000001192092896,
-      0.47528403997421265,
-      0.3615415692329407,
-      0.3420097827911377,
-      0.32933083176612854,
-      0.3184516429901123,
-      0.3146698474884033,
-      0.3083950877189636,
+      0.4752838611602783,
+      0.361541748046875,
+      0.34200987219810486,
+      0.3293308615684509,
+      0.31845155358314514,
+      0.3146699070930481,
+      0.3083951473236084,
       0.30794060230255127,
-      0.3046301305294037,
+      0.3046301603317261,
       0.2827085256576538,
-      0.2818753123283386,
+      0.2818754315376282,
       0.28082767128944397,
-      0.28045278787612915,
+      0.28045275807380676,
       0.2742983102798462,
-      0.2715049386024475,
-      0.27071818709373474,
-      0.2695465385913849,
+      0.27150508761405945,
+      0.2707182765007019,
+      0.26954665780067444,
       0.25990062952041626,
       0.25990062952041626,
-      0.24827902019023895,
-      0.24662014842033386,
-      0.24632105231285095,
-      0.24616341292858124,
+      0.2482791244983673,
+      0.24662019312381744,
+      0.24632097780704498,
+      0.2461635172367096,
       0.24212220311164856,
-      0.23135532438755035,
-      0.2296244204044342,
-      0.2277354896068573
+      0.2313552349805832,
+      0.22962437570095062,
+      0.22773560881614685
     ],
     "PROP": [
       "phylum",
diff --git a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json
index 99391169c5..15979781c5 100644
--- a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json
+++ b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json
@@ -12,30 +12,30 @@
   "query_with_places_removed": "what types of genes are and",
   "sv_matching": {
     "CosineScore": [
-      0.5237791538238525,
-      0.4451894164085388,
-      0.41981467604637146,
-      0.41922128200531006,
+      0.5237787961959839,
+      0.44518938660621643,
+      0.4198148250579834,
+      0.4192213714122772,
       0.4136667847633362,
-      0.4096526503562927,
-      0.40661105513572693,
-      0.4013715982437134,
-      0.4010191261768341,
-      0.400637686252594,
-      0.39874640107154846,
-      0.39836061000823975,
-      0.39052367210388184,
-      0.3890332579612732,
-      0.38846099376678467,
-      0.3883823752403259,
+      0.4096526801586151,
+      0.4066111445426941,
+      0.4013715386390686,
+      0.40101927518844604,
+      0.4006376564502716,
+      0.39874643087387085,
+      0.39836084842681885,
+      0.39052361249923706,
+      0.3890334367752075,
+      0.38846105337142944,
+      0.38838255405426025,
       0.3873301148414612,
-      0.38642191886901855,
-      0.3858962655067444,
-      0.3856789469718933,
-      0.38543426990509033,
-      0.38533884286880493,
+      0.3864220976829529,
+      0.3858964443206787,
+      0.38567888736724854,
+      0.3854343295097351,
+      0.3853389322757721,
       0.3818426728248596,
-      0.37970495223999023
+      0.3797049820423126
     ],
     "MultiSV": {},
     "Query": "what types of genes are and",
@@ -68,29 +68,29 @@
   },
   "props_matching": {
     "CosineScore": [
-      0.908610999584198,
-      0.7445293664932251,
+      0.9086109399795532,
+      0.7445291876792908,
       0.7330226898193359,
-      0.7175887823104858,
-      0.6834691166877747,
-      0.6590197086334229,
-      0.6340402960777283,
-      0.5988124012947083,
-      0.595878541469574,
-      0.5850145220756531,
+      0.7175889611244202,
+      0.6834694743156433,
+      0.6590196490287781,
+      0.6340400576591492,
+      0.5988123416900635,
+      0.5958787202835083,
+      0.5850147604942322,
       0.5810791850090027,
-      0.5432419776916504,
+      0.5432420372962952,
       0.5399730205535889,
-      0.5320467948913574,
+      0.5320468544960022,
       0.5309585928916931,
-      0.5142703056335449,
+      0.5142702460289001,
       0.5125278234481812,
-      0.46105992794036865,
-      0.44410809874534607,
-      0.3982294797897339,
-      0.3944428563117981,
-      0.392289936542511,
-      0.38480231165885925
+      0.4610599875450134,
+      0.4441080391407013,
+      0.3982294499874115,
+      0.3944430947303772,
+      0.3922898471355438,
+      0.38480234146118164
     ],
     "PROP": [
       "typeOfGene",
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 fa25012c6d..6350885352 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
@@ -8,43 +8,43 @@
   "query_with_places_removed": "compare male population with female population",
   "sv_matching": {
     "CosineScore": [
-      0.9187595844268799,
-      0.8590543866157532,
-      0.8354092836380005,
-      0.7823134660720825,
+      0.9187593460083008,
+      0.8590542674064636,
+      0.8354093432426453,
+      0.782313346862793,
       0.7773187756538391,
       0.7762894630432129,
-      0.7663271427154541,
-      0.766107439994812,
-      0.7614184617996216,
-      0.7606041431427002,
-      0.7595797181129456,
-      0.7573733329772949,
-      0.7573024034500122,
+      0.7663272619247437,
+      0.7661074995994568,
+      0.7614185810089111,
+      0.7606043219566345,
+      0.7595797777175903,
+      0.7573733925819397,
+      0.757302463054657,
       0.757297158241272,
-      0.7553009390830994,
+      0.7553008794784546,
       0.7533451318740845,
-      0.7532937526702881,
-      0.7509560585021973,
-      0.7482578754425049,
-      0.7451456785202026,
-      0.7443947792053223,
-      0.7431552410125732,
-      0.7426693439483643,
-      0.7396597862243652,
-      0.7378743290901184,
-      0.7371534109115601,
-      0.7366002798080444,
+      0.7532938122749329,
+      0.7509562373161316,
+      0.7482577562332153,
+      0.7451456189155579,
+      0.7443947196006775,
+      0.7431553602218628,
+      0.7426695227622986,
+      0.7396596670150757,
+      0.7378741502761841,
+      0.7371532917022705,
+      0.7366001009941101,
       0.7347153425216675,
+      0.733927845954895,
       0.733651876449585,
-      0.732607901096344,
-      0.7325160503387451,
-      0.7302997708320618,
-      0.7299268841743469,
-      0.7289118766784668,
-      0.7289034724235535,
-      0.7280722260475159,
-      0.7278057336807251
+      0.7326079607009888,
+      0.7325159311294556,
+      0.7302998900413513,
+      0.7299268245697021,
+      0.7289121150970459,
+      0.7289034128189087,
+      0.7280721664428711
     ],
     "MultiSV": {
       "Candidates": [
@@ -54,7 +54,7 @@
           "Parts": [
             {
               "CosineScore": [
-                0.9257858991622925
+                0.9257857203483582
               ],
               "QueryPart": "male population",
               "SV": [
@@ -63,8 +63,8 @@
             },
             {
               "CosineScore": [
-                0.9296978712081909,
-                0.884743332862854
+                0.92969810962677,
+                0.8847433924674988
               ],
               "QueryPart": "female population",
               "SV": [
@@ -89,8 +89,8 @@
             },
             {
               "CosineScore": [
-                0.8982377648353577,
-                0.8723466396331787
+                0.8982378244400024,
+                0.8723468780517578
               ],
               "QueryPart": "population",
               "SV": [
@@ -106,10 +106,10 @@
           "Parts": [
             {
               "CosineScore": [
-                0.8034241199493408,
-                0.8017654418945312,
-                0.775155782699585,
-                0.7698014974594116,
+                0.8034242391586304,
+                0.8017652630805969,
+                0.7751559019088745,
+                0.7698014378547668,
                 0.7586972713470459
               ],
               "QueryPart": "male",
@@ -123,7 +123,7 @@
             },
             {
               "CosineScore": [
-                0.9170328378677368
+                0.9170328974723816
               ],
               "QueryPart": "population female population",
               "SV": [
@@ -164,6 +164,7 @@
       "dc/topic/UrbanFemalePopulationByAge",
       "Count_Student_Male",
       "dc/topic/SeparatedFemalePopulationByAge",
+      "Count_Person_Civilian_Female_NonInstitutionalized",
       "dc/topic/AsianAloneFemalePopulationByAge",
       "Count_Person_Female_WithHealthInsurance",
       "Count_Person_Workers_Male",
@@ -171,8 +172,7 @@
       "dc/topic/WhiteAloneFemalePopulationByAge",
       "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female",
       "Count_Person_3OrMoreYears_Male_EnrolledInSchool",
-      "dc/topic/MedianHouseholdIncomeByGender",
-      "Count_Death_Male_AsAFractionOf_Count_Person_Male"
+      "dc/topic/MedianHouseholdIncomeByGender"
     ]
   },
   "props_matching": {
diff --git a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json
index 83ff52431b..b2b55e0b16 100644
--- a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json
+++ b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json
@@ -8,55 +8,53 @@
   "query_with_places_removed": "compare obesity vs poverty",
   "sv_matching": {
     "CosineScore": [
-      0.8778442740440369,
-      0.7967699766159058,
-      0.762496829032898,
-      0.7499465942382812,
-      0.7484047412872314,
-      0.7442895174026489,
-      0.7357541918754578,
-      0.7350349426269531,
-      0.7310354709625244,
-      0.7289618253707886,
-      0.7266261577606201,
-      0.7264261841773987,
-      0.7264261841773987,
-      0.7253916263580322,
-      0.7230079174041748,
-      0.7139475345611572,
-      0.7126950621604919,
-      0.7094853520393372,
-      0.7085550427436829,
-      0.7085551023483276,
-      0.7078822255134583,
-      0.7077707052230835,
-      0.7045387029647827,
-      0.7024303078651428,
-      0.7004534602165222,
-      0.6994997262954712,
-      0.6956704258918762,
-      0.6947906613349915,
-      0.6913242936134338
+      0.8778441548347473,
+      0.8041587471961975,
+      0.7967696189880371,
+      0.7624967098236084,
+      0.7490015625953674,
+      0.7484045624732971,
+      0.744289755821228,
+      0.7357543706893921,
+      0.7350348830223083,
+      0.7310351729393005,
+      0.7266256213188171,
+      0.7264258861541748,
+      0.7264258861541748,
+      0.7253913283348083,
+      0.7230079770088196,
+      0.7218308448791504,
+      0.7195378541946411,
+      0.713947594165802,
+      0.7126948237419128,
+      0.7085545063018799,
+      0.7085545063018799,
+      0.7080722451210022,
+      0.7078820466995239,
+      0.7053750157356262,
+      0.7045392394065857,
+      0.7024306058883667,
+      0.7004537582397461,
+      0.6995823383331299,
+      0.6994994282722473,
+      0.6956706047058105,
+      0.6947908997535706
     ],
     "MultiSV": {
       "Candidates": [
         {
-          "AggCosineScore": 0.9234,
+          "AggCosineScore": 0.9478,
           "DelimBased": true,
           "Parts": [
             {
               "CosineScore": [
-                0.8467836380004883,
-                0.8316553831100464,
-                0.8201552033424377,
-                0.8177061080932617
+                0.8955408930778503,
+                0.8525749444961548
               ],
               "QueryPart": "obesity",
               "SV": [
                 "Percent_Person_Obesity",
-                "WHO/NCD_BMI_30A",
-                "dc/4lvmzr1h1ylk1",
-                "dc/x13tvt8jsgrm4"
+                "WHO/NCD_BMI_30A"
               ]
             },
             {
@@ -75,34 +73,36 @@
     "Query": "compare obesity vs poverty",
     "SV": [
       "dc/topic/Poverty",
+      "Percent_Person_Obesity",
       "dc/topic/PovertyByRace",
       "dc/topic/SDG_1",
-      "Percent_Person_Obesity",
+      "WHO/NCD_BMI_30A",
       "dc/topic/sdg_1.2",
       "dc/topic/PovertyByGender",
       "dc/topic/PovertyByLanguageSpokenAtHome",
       "dc/topic/sdg_1.2.2",
       "Count_Household_HouseholderAge65OrMoreYears_FamilyHousehold_BelowPovertyLevelInThePast12Months",
-      "WHO/NCD_BMI_30A",
       "dc/topic/Malnutrition",
       "dc/topic/sdg_2.1.1",
       "sdg/SN_ITK_DEFC",
       "Count_Household_WithFoodStampsInThePast12Months_BelowPovertyLevelInThePast12Months",
       "dc/topic/PovertyByResidency",
+      "dc/4lvmzr1h1ylk1",
+      "dc/x13tvt8jsgrm4",
       "dc/topic/sdg_1",
       "Count_Household_FamilyHousehold_BelowPovertyLevelInThePast12Months",
-      "dc/x13tvt8jsgrm4",
       "dc/topic/FoodInsecurity",
       "dc/topic/sdg_2.1.2",
+      "WHO/NCD_BMI_18A",
       "Count_Household_WithoutFoodStampsInThePast12Months_AbovePovertyLevelInThePast12Months",
-      "dc/4lvmzr1h1ylk1",
+      "WHO/NUTOVERWEIGHTPREV",
       "Count_Household_MarriedCoupleFamilyHousehold_BelowPovertyLevelInThePast12Months",
       "Count_Household_WithFoodStampsInThePast12Months_AbovePovertyLevelInThePast12Months",
       "dc/topic/HealthEquity",
+      "WHO/NUTRITION_WA_2",
       "dc/topic/sdg_1.2.1",
       "Count_Person_BelowPovertyLevelInThePast12Months_TwoOrMoreRaces",
-      "Count_Person_Male_AbovePovertyLevelInThePast12Months_TwoOrMoreRaces",
-      "sdg/SI_POV_DAY1"
+      "Count_Person_Male_AbovePovertyLevelInThePast12Months_TwoOrMoreRaces"
     ]
   },
   "props_matching": {
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 a951931799..e304e2fc8a 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
@@ -8,49 +8,63 @@
   "query_with_places_removed": "how are factors like obesity , blood pressure and asthma impacted by climate change",
   "sv_matching": {
     "CosineScore": [
-      0.7864793539047241,
-      0.7135567665100098,
-      0.691805362701416,
-      0.6740915179252625,
-      0.6734591722488403,
-      0.6704620718955994,
-      0.6635113954544067,
-      0.6593924760818481,
+      0.786479115486145,
+      0.6918054819107056,
+      0.6740914583206177,
+      0.6734592318534851,
+      0.6704619526863098,
+      0.6651464104652405,
+      0.663511335849762,
+      0.6611274480819702,
+      0.6593924164772034,
+      0.65691077709198,
       0.6520178318023682,
-      0.6484817266464233,
-      0.6477762460708618,
+      0.6477761268615723,
       0.6461696624755859,
-      0.6459026336669922,
-      0.6435545682907104,
-      0.6410900354385376,
-      0.6405231952667236,
-      0.6402113437652588,
-      0.6384210586547852,
-      0.6380343437194824,
+      0.6459025740623474,
+      0.6435544490814209,
+      0.6410900950431824,
+      0.6405230760574341,
+      0.6402114033699036,
+      0.638034462928772,
       0.6376669406890869,
-      0.6376464366912842,
-      0.6346377730369568,
+      0.6346378326416016,
       0.6341456174850464,
-      0.6338476538658142,
-      0.6322696805000305,
-      0.6322205662727356,
-      0.6304948925971985,
+      0.6338475346565247,
+      0.6322695016860962,
+      0.6322205066680908,
+      0.6317505240440369,
+      0.630495011806488,
       0.6302965879440308,
       0.6298357844352722
     ],
     "MultiSV": {
       "Candidates": [
         {
-          "AggCosineScore": 0.8999,
+          "AggCosineScore": 0.8763,
           "DelimBased": false,
           "Parts": [
             {
               "CosineScore": [
-                0.7997788190841675
+                0.7526575922966003,
+                0.7335994243621826,
+                0.7317348718643188,
+                0.7282766699790955,
+                0.7210123538970947,
+                0.7188708186149597,
+                0.7138627171516418,
+                0.7071599960327148
               ],
               "QueryPart": "factors like obesity blood pressure asthma impacted",
               "SV": [
-                "dc/topic/Asthma"
+                "Percent_Person_WithAsthma",
+                "dc/topic/BloodPressure",
+                "Percent_Person_Children_WithAsthma",
+                "Percent_Person_Obesity",
+                "dc/topic/AsthmaMalePopulationByAge",
+                "dc/topic/AsthmaFemalePopulationByAge",
+                "dc/topic/HealthConditions",
+                "dc/topic/Health"
               ]
             },
             {
@@ -65,24 +79,20 @@
           ]
         },
         {
-          "AggCosineScore": 0.8615,
+          "AggCosineScore": 0.8668,
           "DelimBased": true,
           "Parts": [
             {
               "CosineScore": [
-                0.7588618993759155,
-                0.7463642954826355,
-                0.740165650844574,
-                0.7351235151290894,
-                0.7130995988845825
+                0.7976330518722534,
+                0.7576605677604675,
+                0.747730553150177
               ],
               "QueryPart": "factors like obesity",
               "SV": [
                 "Percent_Person_Obesity",
                 "WHO/NCD_BMI_30A",
-                "dc/x13tvt8jsgrm4",
-                "dc/4lvmzr1h1ylk1",
-                "dc/topic/Health"
+                "dc/x13tvt8jsgrm4"
               ]
             },
             {
@@ -96,39 +106,45 @@
             },
             {
               "CosineScore": [
-                0.8255698680877686,
-                0.8027870059013367
+                0.8027869462966919
               ],
               "QueryPart": "asthma impacted climate change",
               "SV": [
-                "dc/topic/Asthma",
                 "dc/topic/ClimateChange"
               ]
             }
           ]
         },
         {
-          "AggCosineScore": 0.8413,
+          "AggCosineScore": 0.8276,
           "DelimBased": false,
           "Parts": [
             {
               "CosineScore": [
-                0.7768431901931763,
-                0.7495046257972717,
+                0.7495045065879822,
+                0.7472652792930603,
+                0.7385283708572388,
                 0.7342654466629028,
-                0.7325114011764526
+                0.7325113415718079,
+                0.7185328006744385,
+                0.717232882976532,
+                0.7033888697624207
               ],
               "QueryPart": "factors like obesity blood pressure asthma",
               "SV": [
-                "dc/topic/Asthma",
                 "dc/topic/BloodPressure",
+                "Percent_Person_Obesity",
+                "Percent_Person_WithAsthma",
                 "dc/topic/HealthConditions",
-                "dc/topic/Health"
+                "dc/topic/Health",
+                "WHO/NCD_BMI_30A",
+                "Percent_Person_Children_WithAsthma",
+                "dc/x13tvt8jsgrm4"
               ]
             },
             {
               "CosineScore": [
-                0.9056921005249023
+                0.9056917428970337
               ],
               "QueryPart": "impacted climate change",
               "SV": [
@@ -138,12 +154,12 @@
           ]
         },
         {
-          "AggCosineScore": 0.8232,
+          "AggCosineScore": 0.8118,
           "DelimBased": false,
           "Parts": [
             {
               "CosineScore": [
-                0.8207905888557434
+                0.8207905292510986
               ],
               "QueryPart": "factors like obesity blood pressure",
               "SV": [
@@ -152,12 +168,10 @@
             },
             {
               "CosineScore": [
-                0.8255698680877686,
-                0.8027870059013367
+                0.8027869462966919
               ],
               "QueryPart": "asthma impacted climate change",
               "SV": [
-                "dc/topic/Asthma",
                 "dc/topic/ClimateChange"
               ]
             }
@@ -168,15 +182,16 @@
     "Query": "how are factors like obesity , blood pressure and asthma impacted by climate change",
     "SV": [
       "dc/topic/ClimateChange",
-      "dc/topic/Asthma",
       "dc/topic/ProjectedClimateExtremes",
       "dc/topic/BloodPressure",
       "dc/topic/sdg_13.3",
       "dc/topic/CO2Emissions",
+      "Percent_Person_Obesity",
       "Annual_Emissions_GreenhouseGas",
+      "Percent_Person_Children_WithAsthma",
       "dc/topic/AmbientAirPollution",
+      "Percent_Person_WithAsthma",
       "Annual_Amount_Emissions_SCC_27_NaturalSources",
-      "Percent_Person_Obesity",
       "dc/topic/WHOMortalityCauses",
       "dc/topic/sdg_3.9.1",
       "dc/topic/GlobalHealth",
@@ -184,15 +199,14 @@
       "dc/topic/sdg_13",
       "dc/topic/sdg_13.b",
       "dc/topic/sdg_13.2.1",
-      "Percent_Person_Children_WithAsthma",
       "dc/topic/sdg_13.2.2",
       "dc/topic/WHONonCommunicableDiseases",
-      "Percent_Person_WithAsthma",
       "dc/topic/Emissions",
       "dc/topic/Pollutants",
       "Annual_Emissions_GreenhouseGas_OilAndGas",
       "dc/topic/GreenhouseGasEmissions",
       "dc/topic/AsthmaFemalePopulationByAge",
+      "WHO/NUTOVERWEIGHTPREV",
       "dc/topic/sdg_13.1",
       "dc/topic/sdg_13.2",
       "dc/topic/sdg_11.6.2"
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 9732c39707..b7f3355532 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
@@ -8,45 +8,45 @@
   "query_with_places_removed": "number of poor hispanic women with phd",
   "sv_matching": {
     "CosineScore": [
-      0.7985796332359314,
-      0.7883262634277344,
-      0.776346743106842,
-      0.77406245470047,
-      0.7410296201705933,
-      0.7334667444229126,
-      0.7228284478187561,
+      0.7985796928405762,
+      0.7883263230323792,
+      0.7763466238975525,
+      0.7740623950958252,
+      0.7410295009613037,
+      0.7334668040275574,
+      0.7228283286094666,
       0.722568929195404,
-      0.6995474100112915,
-      0.6995023488998413,
+      0.699547290802002,
+      0.699502170085907,
       0.697618305683136,
-      0.6974341869354248,
-      0.696003794670105,
-      0.6953426003456116,
-      0.6945168972015381,
-      0.6939643621444702,
+      0.6974342465400696,
+      0.6960037350654602,
+      0.6953428387641907,
+      0.694516658782959,
+      0.6939643025398254,
       0.6935360431671143,
-      0.6908406019210815,
+      0.6908405423164368,
       0.6906974911689758,
-      0.6896734237670898,
-      0.6889521479606628,
-      0.6886201500892639,
+      0.6896733641624451,
+      0.6889522075653076,
+      0.6886200308799744,
       0.6863292455673218,
-      0.6859177947044373,
-      0.6827540397644043,
-      0.6822139620780945,
-      0.6815624237060547,
+      0.685917854309082,
+      0.6827539205551147,
+      0.6822137832641602,
+      0.6815624833106995,
       0.67987459897995,
-      0.676856517791748,
-      0.6763089299201965,
-      0.6751540303230286,
+      0.6768563985824585,
+      0.6763089895248413,
+      0.6751541495323181,
       0.6744991540908813,
-      0.6725671291351318,
+      0.6725670099258423,
       0.6717973947525024,
-      0.6691675186157227,
+      0.669167697429657,
       0.6690007448196411,
-      0.6682180762290955,
+      0.6682179570198059,
       0.6678104400634766,
-      0.6650688052177429,
+      0.6650689244270325,
       0.6648702621459961
     ],
     "MultiSV": {
@@ -57,13 +57,13 @@
           "Parts": [
             {
               "CosineScore": [
-                0.8311771750450134,
-                0.8310011029243469,
-                0.8255152702331543,
+                0.8311770558357239,
+                0.8310011625289917,
+                0.8255152106285095,
                 0.8195514678955078,
-                0.8145602345466614,
-                0.8090661764144897,
-                0.8086389303207397,
+                0.8145602941513062,
+                0.8090663552284241,
+                0.808638870716095,
                 0.8074402809143066,
                 0.8002950549125671,
                 0.7985796332359314,
@@ -86,8 +86,8 @@
             },
             {
               "CosineScore": [
-                0.8318259119987488,
-                0.8029923439025879
+                0.8318257927894592,
+                0.8029924035072327
               ],
               "QueryPart": "women phd",
               "SV": [
@@ -103,7 +103,7 @@
           "Parts": [
             {
               "CosineScore": [
-                0.8366719484329224,
+                0.8366715908050537,
                 0.7972691059112549
               ],
               "QueryPart": "number of poor",
@@ -115,9 +115,9 @@
             {
               "CosineScore": [
                 0.8151505589485168,
-                0.7885995507240295,
-                0.7775554656982422,
-                0.7752053141593933
+                0.7885996103286743,
+                0.7775554060935974,
+                0.7752053737640381
               ],
               "QueryPart": "hispanic women phd",
               "SV": [
@@ -135,8 +135,8 @@
           "Parts": [
             {
               "CosineScore": [
-                0.8495935201644897,
-                0.8335005044937134
+                0.8495936393737793,
+                0.8335006833076477
               ],
               "QueryPart": "number of poor hispanic women",
               "SV": [
@@ -146,11 +146,11 @@
             },
             {
               "CosineScore": [
-                0.7646968960762024,
+                0.7646969556808472,
                 0.7476688027381897,
-                0.7377066612243652,
-                0.7362767457962036,
-                0.7305882573127747
+                0.73770672082901,
+                0.7362766265869141,
+                0.7305881381034851
               ],
               "QueryPart": "phd",
               "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 9eddfc3063..e84301f8c5 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
@@ -8,29 +8,29 @@
   "query_with_places_removed": "show me the impact of climate change on drought",
   "sv_matching": {
     "CosineScore": [
-      0.8393681645393372,
-      0.79311203956604,
-      0.7699974775314331,
+      0.8393682837486267,
+      0.7931120991706848,
+      0.7699974179267883,
       0.7208107709884644,
       0.7175306081771851,
-      0.6995436549186707,
-      0.6863456964492798,
-      0.674246609210968,
+      0.6995437741279602,
+      0.6863457560539246,
+      0.6742466688156128,
       0.6730499267578125,
       0.6703540682792664,
-      0.6652892827987671,
-      0.6644606590270996,
+      0.6652891635894775,
+      0.6644605994224548,
       0.6353792548179626,
-      0.6349931359291077,
-      0.6347004771232605,
-      0.630818247795105,
+      0.6349930763244629,
+      0.63470059633255,
+      0.6308180689811707,
       0.6290862560272217,
       0.6256592273712158,
-      0.6180376410484314,
-      0.6162123084068298,
-      0.6141720414161682,
-      0.6139707565307617,
-      0.6138609647750854,
+      0.6180377006530762,
+      0.6162122488021851,
+      0.6141719818115234,
+      0.6139708161354065,
+      0.6138609051704407,
       0.6123877167701721
     ],
     "MultiSV": {
@@ -41,7 +41,7 @@
           "Parts": [
             {
               "CosineScore": [
-                0.8787487149238586
+                0.8787487745285034
               ],
               "QueryPart": "show climate change",
               "SV": [
@@ -50,7 +50,7 @@
             },
             {
               "CosineScore": [
-                1.0
+                0.9999998807907104
               ],
               "QueryPart": "drought",
               "SV": [
@@ -65,18 +65,22 @@
           "Parts": [
             {
               "CosineScore": [
-                0.7942368984222412,
-                0.7929012775421143
+                0.7942370176315308,
+                0.7929014563560486,
+                0.7586166858673096,
+                0.7583958506584167
               ],
               "QueryPart": "show climate",
               "SV": [
                 "dc/topic/ProjectedClimateExtremes",
-                "dc/topic/ClimateChange"
+                "dc/topic/ClimateChange",
+                "dc/topic/Temperatures",
+                "Temperature"
               ]
             },
             {
               "CosineScore": [
-                0.866512656211853
+                0.8665125966072083
               ],
               "QueryPart": "change drought",
               "SV": [
diff --git a/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json b/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json
index 44976d2dc6..12774330e2 100644
--- a/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json
+++ b/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json
@@ -33,38 +33,6 @@
             "denom": "Count_Person",
             "title": "Criminal Activities"
           },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_CombinedCrime"
-                    ],
-                    "title": "Criminal Activities in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_CombinedCrime"
-                    ],
-                    "title": "Criminal Activities in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Criminal Activities in States of United States"
-          },
           {
             "columns": [
               {
@@ -125,277 +93,13 @@
             ],
             "denom": "Count_Person",
             "title": "Crimes by Type"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_AggravatedAssault"
-                    ],
-                    "title": "Aggravated Assault Cases in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_AggravatedAssault"
-                    ],
-                    "title": "Aggravated Assault Cases in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Aggravated Assault Cases in States of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_Burglary"
-                    ],
-                    "title": "Burglaries in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_Burglary"
-                    ],
-                    "title": "Burglaries in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Burglaries in States of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_ForcibleRape"
-                    ],
-                    "title": "Forcible Rapes in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_ForcibleRape"
-                    ],
-                    "title": "Forcible Rapes in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Forcible Rapes in States of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_LarcenyTheft"
-                    ],
-                    "title": "Larceny Theft Cases in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_LarcenyTheft"
-                    ],
-                    "title": "Larceny Theft Cases in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Larceny Theft Cases in States of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_MotorVehicleTheft"
-                    ],
-                    "title": "Motor Vehicle Thefts in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_MotorVehicleTheft"
-                    ],
-                    "title": "Motor Vehicle Thefts in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Motor Vehicle Thefts in States of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_PropertyCrime"
-                    ],
-                    "title": "Property Related Crimes in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_PropertyCrime"
-                    ],
-                    "title": "Property Related Crimes in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Property Related Crimes in States of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_Robbery"
-                    ],
-                    "title": "Robberies in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_Robbery"
-                    ],
-                    "title": "Robberies in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Robberies in States of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_CriminalActivities_ViolentCrime"
-                    ],
-                    "title": "Violent Crimes in States of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_CriminalActivities_ViolentCrime"
-                    ],
-                    "title": "Violent Crimes in States of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Violent Crimes in States of United States"
           }
         ],
         "statVarSpec": {
-          "Count_CriminalActivities_AggravatedAssault": {
-            "name": "Aggravated Assault Cases",
-            "statVar": "Count_CriminalActivities_AggravatedAssault"
-          },
           "Count_CriminalActivities_AggravatedAssault_multiple_place_bar_block": {
             "name": "Aggravated Assault Cases",
             "statVar": "Count_CriminalActivities_AggravatedAssault"
           },
-          "Count_CriminalActivities_Burglary": {
-            "name": "Burglaries",
-            "statVar": "Count_CriminalActivities_Burglary"
-          },
           "Count_CriminalActivities_Burglary_multiple_place_bar_block": {
             "name": "Burglaries",
             "statVar": "Count_CriminalActivities_Burglary"
@@ -404,26 +108,14 @@
             "name": "Criminal Activities",
             "statVar": "Count_CriminalActivities_CombinedCrime"
           },
-          "Count_CriminalActivities_ForcibleRape": {
-            "name": "Forcible Rapes",
-            "statVar": "Count_CriminalActivities_ForcibleRape"
-          },
           "Count_CriminalActivities_ForcibleRape_multiple_place_bar_block": {
             "name": "Forcible Rapes",
             "statVar": "Count_CriminalActivities_ForcibleRape"
           },
-          "Count_CriminalActivities_LarcenyTheft": {
-            "name": "Larceny Theft Cases",
-            "statVar": "Count_CriminalActivities_LarcenyTheft"
-          },
           "Count_CriminalActivities_LarcenyTheft_multiple_place_bar_block": {
             "name": "Larceny Theft Cases",
             "statVar": "Count_CriminalActivities_LarcenyTheft"
           },
-          "Count_CriminalActivities_MotorVehicleTheft": {
-            "name": "Motor Vehicle Thefts",
-            "statVar": "Count_CriminalActivities_MotorVehicleTheft"
-          },
           "Count_CriminalActivities_MotorVehicleTheft_multiple_place_bar_block": {
             "name": "Motor Vehicle Thefts",
             "statVar": "Count_CriminalActivities_MotorVehicleTheft"
@@ -432,26 +124,14 @@
             "name": "Murder and Non Negligent Manslaughter Cases Per Capita",
             "statVar": "Count_CriminalActivities_MurderAndNonNegligentManslaughter_AsFractionOf_Count_Person"
           },
-          "Count_CriminalActivities_PropertyCrime": {
-            "name": "Property Related Crimes",
-            "statVar": "Count_CriminalActivities_PropertyCrime"
-          },
           "Count_CriminalActivities_PropertyCrime_multiple_place_bar_block": {
             "name": "Property Related Crimes",
             "statVar": "Count_CriminalActivities_PropertyCrime"
           },
-          "Count_CriminalActivities_Robbery": {
-            "name": "Robberies",
-            "statVar": "Count_CriminalActivities_Robbery"
-          },
           "Count_CriminalActivities_Robbery_multiple_place_bar_block": {
             "name": "Robberies",
             "statVar": "Count_CriminalActivities_Robbery"
           },
-          "Count_CriminalActivities_ViolentCrime": {
-            "name": "Violent Crimes",
-            "statVar": "Count_CriminalActivities_ViolentCrime"
-          },
           "Count_CriminalActivities_ViolentCrime_multiple_place_bar_block": {
             "name": "Violent Crimes",
             "statVar": "Count_CriminalActivities_ViolentCrime"
@@ -460,9 +140,6 @@
       }
     ],
     "metadata": {
-      "containedPlaceTypes": {
-        "Country": "State"
-      },
       "placeDcid": [
         "country/USA"
       ]
@@ -487,360 +164,7 @@
     }
   ],
   "relatedThings": {
-    "childPlaces": {
-      "State": [
-        {
-          "dcid": "geoId/01",
-          "name": "Alabama",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/02",
-          "name": "Alaska",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/04",
-          "name": "Arizona",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/05",
-          "name": "Arkansas",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/06",
-          "name": "California",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/08",
-          "name": "Colorado",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/09",
-          "name": "Connecticut",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/10",
-          "name": "Delaware",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/11",
-          "name": "District of Columbia",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/12",
-          "name": "Florida",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/13",
-          "name": "Georgia",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/15",
-          "name": "Hawaii",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/16",
-          "name": "Idaho",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/17",
-          "name": "Illinois",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/18",
-          "name": "Indiana",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/19",
-          "name": "Iowa",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/20",
-          "name": "Kansas",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/21",
-          "name": "Kentucky",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/22",
-          "name": "Louisiana",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/23",
-          "name": "Maine",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/24",
-          "name": "Maryland",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/25",
-          "name": "Massachusetts",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/26",
-          "name": "Michigan",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/27",
-          "name": "Minnesota",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/28",
-          "name": "Mississippi",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/29",
-          "name": "Missouri",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/30",
-          "name": "Montana",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/31",
-          "name": "Nebraska",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/32",
-          "name": "Nevada",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/33",
-          "name": "New Hampshire",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/34",
-          "name": "New Jersey",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/35",
-          "name": "New Mexico",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/36",
-          "name": "New York",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/37",
-          "name": "North Carolina",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/38",
-          "name": "North Dakota",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/39",
-          "name": "Ohio",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/40",
-          "name": "Oklahoma",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/41",
-          "name": "Oregon",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/42",
-          "name": "Pennsylvania",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/44",
-          "name": "Rhode Island",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/45",
-          "name": "South Carolina",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/46",
-          "name": "South Dakota",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/47",
-          "name": "Tennessee",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/48",
-          "name": "Texas",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/49",
-          "name": "Utah",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/50",
-          "name": "Vermont",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/51",
-          "name": "Virginia",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/53",
-          "name": "Washington",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/54",
-          "name": "West Virginia",
-          "types": [
-            "State"
-          ]
-        },
-        {
-          "dcid": "geoId/55",
-          "name": "Wisconsin",
-          "types": [
-            "State"
-          ]
-        }
-      ]
-    },
+    "childPlaces": {},
     "childTopics": [],
     "exploreMore": {
       "Count_CriminalActivities_CombinedCrime": {
diff --git a/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json b/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json
index c4781bfc08..39e238486c 100644
--- a/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json
+++ b/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json
@@ -508,6 +508,67 @@
             "denom": "Count_Person",
             "title": "Population: 16-64 Years, Female, Full Time Year Round Worker in States of United States of America"
           },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Count_Person_Civilian_Female_NonInstitutionalized"
+                    ],
+                    "title": "Women Non Institutionalized in United States of America",
+                    "type": "LINE"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "description": "Women Non Institutionalized in United States of America",
+                    "statVarKey": [
+                      "Count_Person_Civilian_Female_NonInstitutionalized"
+                    ],
+                    "title": "Women Non Institutionalized in United States of America",
+                    "type": "HIGHLIGHT"
+                  }
+                ]
+              }
+            ],
+            "denom": "Count_Person",
+            "title": "Women Non Institutionalized"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Count_Person_Civilian_Female_NonInstitutionalized"
+                    ],
+                    "title": "Women Non Institutionalized in States of United States of America (${date})",
+                    "type": "MAP"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "rankingTileSpec": {
+                      "rankingCount": 5,
+                      "showHighestLowest": true
+                    },
+                    "statVarKey": [
+                      "Count_Person_Civilian_Female_NonInstitutionalized"
+                    ],
+                    "title": "Women Non Institutionalized in States of United States of America (${date})",
+                    "type": "RANKING"
+                  }
+                ]
+              }
+            ],
+            "denom": "Count_Person",
+            "title": "Women Non Institutionalized in States of United States of America"
+          },
           {
             "columns": [
               {
@@ -799,67 +860,6 @@
             ],
             "denom": "Count_Person",
             "title": "Women With Disabilities in States of United States of America"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female"
-                    ],
-                    "title": "Bachelors, Women in United States of America",
-                    "type": "LINE"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "description": "Bachelors, Women in United States of America",
-                    "statVarKey": [
-                      "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female"
-                    ],
-                    "title": "Bachelors, Women in United States of America",
-                    "type": "HIGHLIGHT"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Bachelors, Women"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female"
-                    ],
-                    "title": "Bachelors, Women in States of United States of America (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female"
-                    ],
-                    "title": "Bachelors, Women in States of United States of America (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Bachelors, Women in States of United States of America"
           }
         ],
         "statVarSpec": {
@@ -875,14 +875,14 @@
             "name": "Population: Bachelors Degree or Higher, Female",
             "statVar": "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female"
           },
-          "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female": {
-            "name": "Bachelors, Women",
-            "statVar": "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female"
-          },
           "Count_Person_3OrMoreYears_Female_EnrolledInSchool": {
             "name": "Population: Female, Enrolled in School",
             "statVar": "Count_Person_3OrMoreYears_Female_EnrolledInSchool"
           },
+          "Count_Person_Civilian_Female_NonInstitutionalized": {
+            "name": "Women Non Institutionalized",
+            "statVar": "Count_Person_Civilian_Female_NonInstitutionalized"
+          },
           "Count_Person_Female": {
             "name": "Women",
             "statVar": "Count_Person_Female"
@@ -1384,13 +1384,20 @@
           "Count_Person_45To64Years_EducationalAttainmentBachelorsDegreeOrHigher_Female"
         ]
       },
-      "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female": {
+      "Count_Person_Civilian_Female_NonInstitutionalized": {
         "age": [
-          "Count_Person_18To24Years_EducationalAttainmentBachelorsDegree_Female",
-          "Count_Person_25To34Years_EducationalAttainmentBachelorsDegree_Female",
-          "Count_Person_35To44Years_EducationalAttainmentBachelorsDegree_Female",
-          "Count_Person_45To64Years_EducationalAttainmentBachelorsDegree_Female",
-          "Count_Person_65OrMoreYears_EducationalAttainmentBachelorsDegree_Female"
+          "dc/09z87msgrnz46",
+          "dc/3ynz47ezvb9t3",
+          "dc/9zrfybzebz9eg",
+          "dc/clt08ev67qbg4",
+          "dc/e4tnwblpn05ng",
+          "dc/eyq93l7lzkljh",
+          "dc/fdt2p0r5fced1",
+          "dc/g8tzm4h7qzqnd",
+          "dc/spwgfh6tfr03c",
+          "dc/vqxc814k47fc5",
+          "dc/x8zvw66c41lx",
+          "dc/z3blp4w0t2nv2"
         ]
       },
       "Count_Person_Female": {
@@ -1403,11 +1410,6 @@
           "Count_Person_67To69Years_Female",
           "Count_Person_Upto14Years_Female"
         ],
-        "educationalAttainment": [
-          "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female",
-          "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female",
-          "Count_Person_EducationalAttainmentBachelorsDegree_Female"
-        ],
         "race": [
           "Count_Person_Female_AsianAlone",
           "Count_Person_Female_TwoOrMoreRaces",
diff --git a/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json b/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json
index 24b41bc01d..c2f14e41e0 100644
--- a/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json
+++ b/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json
@@ -39,34 +39,36 @@
                 "tiles": [
                   {
                     "statVarKey": [
-                      "dc/0gettc3bc60cb"
+                      "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
                     ],
-                    "title": "Drive Alone in Counties of California (${date})",
-                    "type": "MAP"
+                    "title": "Count of Crash Incidents With Head on Collision in California",
+                    "type": "LINE"
                   }
                 ]
               },
               {
                 "tiles": [
                   {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
+                    "description": "Count of Crash Incidents With Head on Collision in California",
                     "statVarKey": [
-                      "dc/0gettc3bc60cb"
+                      "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
                     ],
-                    "title": "Drive Alone in Counties of California (${date})",
-                    "type": "RANKING"
+                    "title": "Count of Crash Incidents With Head on Collision in California",
+                    "type": "HIGHLIGHT"
                   }
                 ]
               }
             ],
             "denom": "Count_Person",
-            "title": "Drive Alone in Counties of California"
+            "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.",
+            "title": "Count of Crash Incidents With Head on Collision"
           }
         ],
         "statVarSpec": {
+          "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision": {
+            "name": "Count of crash incidents with head on collision",
+            "statVar": "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
+          },
           "dc/0gettc3bc60cb": {
             "name": "Drive alone",
             "statVar": "dc/0gettc3bc60cb"
@@ -75,9 +77,6 @@
       }
     ],
     "metadata": {
-      "containedPlaceTypes": {
-        "State": "County"
-      },
       "placeDcid": [
         "geoId/06"
       ]
diff --git a/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json b/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json
index 42bd0184f4..9e02c60536 100644
--- a/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json
+++ b/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json
@@ -9,82 +9,17 @@
               {
                 "tiles": [
                   {
-                    "scatterTileSpec": {
-                      "highlightTopRight": true
-                    },
-                    "statVarKey": [
-                      "Percent_Person_Obesity_scatter",
-                      "Percent_Person_SleepLessThan7Hours_scatter"
-                    ],
-                    "title": "Prevalence of Obesity (${yDate}) Vs. Percentage That Sleeps Less Than 7 Hours Per Night (${xDate}) in Counties of United States",
-                    "type": "SCATTER"
-                  }
-                ]
-              }
-            ],
-            "title": "Prevalence of Obesity vs. Percentage That Sleeps Less Than 7 Hours Per Night"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Percent_Person_Obesity"
-                    ],
-                    "title": "Prevalence of Obesity in Counties of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "Percent_Person_Obesity"
-                    ],
-                    "title": "Prevalence of Obesity in Counties of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "title": "Prevalence of Obesity in Counties of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "Percent_Person_SleepLessThan7Hours"
-                    ],
-                    "title": "Percentage That Sleeps Less Than 7 Hours Per Night in Counties of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
                     "statVarKey": [
+                      "Percent_Person_Obesity",
                       "Percent_Person_SleepLessThan7Hours"
                     ],
-                    "title": "Percentage That Sleeps Less Than 7 Hours Per Night in Counties of United States (${date})",
-                    "type": "RANKING"
+                    "title": "Prevalence of Obesity and Percentage That Sleeps Less Than 7 Hours Per Night in United States",
+                    "type": "LINE"
                   }
                 ]
               }
             ],
-            "title": "Percentage That Sleeps Less Than 7 Hours Per Night in Counties of United States"
+            "title": "Prevalence of Obesity and Percentage That Sleeps Less Than 7 Hours Per Night"
           },
           {
             "columns": [
@@ -102,109 +37,6 @@
               }
             ],
             "title": "% Obesity Among Adults, BMI >= 30 and Percentage That Sleeps Less Than 7 Hours Per Night"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "scatterTileSpec": {
-                      "highlightTopRight": true
-                    },
-                    "statVarKey": [
-                      "dc/4lvmzr1h1ylk1_scatter",
-                      "Percent_Person_SleepLessThan7Hours_scatter"
-                    ],
-                    "title": "Prevalence: Female, Obesity (${yDate}) Vs. Percentage That Sleeps Less Than 7 Hours Per Night (${xDate}) in Counties of United States",
-                    "type": "SCATTER"
-                  }
-                ]
-              }
-            ],
-            "title": "Prevalence: Female, Obesity vs. Percentage That Sleeps Less Than 7 Hours Per Night"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "dc/4lvmzr1h1ylk1"
-                    ],
-                    "title": "Prevalence: Female, Obesity in Counties of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "dc/4lvmzr1h1ylk1"
-                    ],
-                    "title": "Prevalence: Female, Obesity in Counties of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "title": "Prevalence: Female, Obesity in Counties of United States"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "scatterTileSpec": {
-                      "highlightTopRight": true
-                    },
-                    "statVarKey": [
-                      "dc/x13tvt8jsgrm4_scatter",
-                      "Percent_Person_SleepLessThan7Hours_scatter"
-                    ],
-                    "title": "Prevalence: Male, Obesity (${yDate}) Vs. Percentage That Sleeps Less Than 7 Hours Per Night (${xDate}) in Counties of United States",
-                    "type": "SCATTER"
-                  }
-                ]
-              }
-            ],
-            "denom": "Count_Person",
-            "title": "Prevalence: Male, Obesity vs. Percentage That Sleeps Less Than 7 Hours Per Night"
-          },
-          {
-            "columns": [
-              {
-                "tiles": [
-                  {
-                    "statVarKey": [
-                      "dc/x13tvt8jsgrm4"
-                    ],
-                    "title": "Prevalence: Male, Obesity in Counties of United States (${date})",
-                    "type": "MAP"
-                  }
-                ]
-              },
-              {
-                "tiles": [
-                  {
-                    "rankingTileSpec": {
-                      "rankingCount": 5,
-                      "showHighestLowest": true
-                    },
-                    "statVarKey": [
-                      "dc/x13tvt8jsgrm4"
-                    ],
-                    "title": "Prevalence: Male, Obesity in Counties of United States (${date})",
-                    "type": "RANKING"
-                  }
-                ]
-              }
-            ],
-            "title": "Prevalence: Male, Obesity in Counties of United States"
           }
         ],
         "statVarSpec": {
@@ -213,51 +45,19 @@
             "statVar": "Percent_Person_Obesity",
             "unit": "%"
           },
-          "Percent_Person_Obesity_scatter": {
-            "name": "Prevalence of Obesity",
-            "noPerCapita": true,
-            "statVar": "Percent_Person_Obesity",
-            "unit": "%"
-          },
           "Percent_Person_SleepLessThan7Hours": {
             "name": "Percentage That Sleeps Less Than 7 Hours Per Night",
             "statVar": "Percent_Person_SleepLessThan7Hours",
             "unit": "%"
           },
-          "Percent_Person_SleepLessThan7Hours_scatter": {
-            "name": "Percentage That Sleeps Less Than 7 Hours Per Night",
-            "noPerCapita": true,
-            "statVar": "Percent_Person_SleepLessThan7Hours",
-            "unit": "%"
-          },
           "WHO/NCD_BMI_30A": {
             "name": "% Obesity Among Adults, BMI >= 30",
             "statVar": "WHO/NCD_BMI_30A"
-          },
-          "dc/4lvmzr1h1ylk1": {
-            "name": "Prevalence: Female, Obesity",
-            "statVar": "dc/4lvmzr1h1ylk1"
-          },
-          "dc/4lvmzr1h1ylk1_scatter": {
-            "name": "Prevalence: Female, Obesity",
-            "noPerCapita": true,
-            "statVar": "dc/4lvmzr1h1ylk1"
-          },
-          "dc/x13tvt8jsgrm4": {
-            "name": "Prevalence: Male, Obesity",
-            "statVar": "dc/x13tvt8jsgrm4"
-          },
-          "dc/x13tvt8jsgrm4_scatter": {
-            "name": "Prevalence: Male, Obesity",
-            "statVar": "dc/x13tvt8jsgrm4"
           }
         }
       }
     ],
     "metadata": {
-      "containedPlaceTypes": {
-        "Country": "County"
-      },
       "placeDcid": [
         "country/USA"
       ]
diff --git a/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json b/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json
index a2bf5a61ac..0f74c3c7fc 100644
--- a/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json
+++ b/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json
@@ -64,9 +64,76 @@
             ],
             "denom": "Count_Person",
             "title": "Drive Alone in Counties of California"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
+                    ],
+                    "title": "Count of Crash Incidents With Head on Collision in California",
+                    "type": "LINE"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "description": "Count of Crash Incidents With Head on Collision in California",
+                    "statVarKey": [
+                      "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
+                    ],
+                    "title": "Count of Crash Incidents With Head on Collision in California",
+                    "type": "HIGHLIGHT"
+                  }
+                ]
+              }
+            ],
+            "denom": "Count_Person",
+            "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.",
+            "title": "Count of Crash Incidents With Head on Collision"
+          },
+          {
+            "columns": [
+              {
+                "tiles": [
+                  {
+                    "statVarKey": [
+                      "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
+                    ],
+                    "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})",
+                    "type": "MAP"
+                  }
+                ]
+              },
+              {
+                "tiles": [
+                  {
+                    "rankingTileSpec": {
+                      "rankingCount": 5,
+                      "showHighestLowest": true
+                    },
+                    "statVarKey": [
+                      "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
+                    ],
+                    "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})",
+                    "type": "RANKING"
+                  }
+                ]
+              }
+            ],
+            "denom": "Count_Person",
+            "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.",
+            "title": "Count of Crash Incidents With Head on Collision in Counties of California"
           }
         ],
         "statVarSpec": {
+          "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision": {
+            "name": "Count of crash incidents with head on collision",
+            "statVar": "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision"
+          },
           "dc/0gettc3bc60cb": {
             "name": "Drive alone",
             "statVar": "dc/0gettc3bc60cb"
diff --git a/tools/nl/embeddings/input/base/2024_q3.csv b/tools/nl/embeddings/input/base/2024_q3.csv
new file mode 100644
index 0000000000..7a6956529a
--- /dev/null
+++ b/tools/nl/embeddings/input/base/2024_q3.csv
@@ -0,0 +1,8 @@
+dcid,sentence
+Count_Person_InvolvedInCrash_Motorists,Number of motorists involved in crash
+Count_Person_InvolvedInCrash_MotorVehicleOccupant,Number of motor vehicle occupants involved in crash
+Count_Vehicle_InvolvedInCrash_InTransport,Number of moving vehicles involved in crash
+Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision,Number of head-on collision vehicle crash
+Count_VehicleCrashIncident_InvolvedInCrash_SchoolBus,Number of crashes with school buses
+Count_VehicleCrashIncident_NationalHighway,Number of vehicle crash incidents occurred on the national highway
+Count_VehicleCrashIncident_StateHighway,Number of vehicle crash incidents occurred on the state highway
diff --git a/tools/nl/embeddings/input/base/_preindex.csv b/tools/nl/embeddings/input/base/_preindex.csv
index b217207967..aa49089170 100644
--- a/tools/nl/embeddings/input/base/_preindex.csv
+++ b/tools/nl/embeddings/input/base/_preindex.csv
@@ -2083,6 +2083,7 @@ Number of countries using ecosystem-based approaches to managing marine areas,dc
 Number of countries with mechanisms in place to enhance policy coherence of sustainable development,dc/topic/sdg_17.14.1
 "Number of countries with migration policies that facilitate orderly, safe, regular and responsible migration and mobility of people",dc/topic/sdg_10.7.2
 "Number of countries with nationally determined contributions, long-term strategies, national adaptation plans and adaptation communications, as reported to the secretariat of the United Nations Framework Convention on Climate Change",dc/topic/sdg_13.2.1
+Number of crashes with school buses,Count_VehicleCrashIncident_InvolvedInCrash_SchoolBus
 Number of crimes,Count_CriminalActivities_CombinedCrime
 Number of cyclones,Count_CycloneEvent
 Number of deaths,Count_Death
@@ -2271,6 +2272,7 @@ Number of full time year round workers with earnings,Count_Person_WithEarnings_F
 Number of gambling establishments in gambling industries,dc/3jr0p7yjw06z9
 Number of girls under 4 years old,Count_Person_0To4Years_Female
 Number of hate crime incidents,Count_CriminalIncidents_IsHateCrime
+Number of head-on collision vehicle crash,Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision
 Number of heat events,Count_HeatEvent
 Number of heat waves,Count_HeatWaveEvent
 Number of hispanic or latino people who reside in college or university student housing,Count_Person_HispanicOrLatino_ResidesInCollegeOrUniversityStudentHousing
@@ -2523,6 +2525,9 @@ Number of married people who reside in nursing facilities,Count_Person_MarriedAn
 "Number of married people, including separated",Count_Person_NowMarried
 Number of married white people,Count_Person_15OrMoreYears_MarriedAndNotSeparated_WhiteAlone
 Number of mobile phone subscriptions per person,Count_Product_MobileCellularSubscription_AsFractionOf_Count_Person
+Number of motor vehicle occupants involved in crash,Count_Person_InvolvedInCrash_MotorVehicleOccupant
+Number of motorists involved in crash,Count_Person_InvolvedInCrash_Motorists
+Number of moving vehicles involved in crash,Count_Vehicle_InvolvedInCrash_InTransport
 Number of multi race people with disabilities,Count_Person_WithDisability_TwoOrMoreRaces
 Number of multi races farmers,Count_Person_Producer_TwoOrMoreRaces
 Number of multi races female With Bachelor or higher Degree,dc/hyfn2tlyz48lb
@@ -2813,6 +2818,8 @@ Number of urban scheduled caste people,Count_Person_ScheduledCaste_Urban
 Number of urban scheduled caste people below 6 years,Count_Person_ScheduledCaste_YearsUpto6_Urban
 Number of urban scheduled tribe people,Count_Person_ScheduledTribe_Urban
 Number of urban scheduled tribe people below 6 years,Count_Person_ScheduledTribe_YearsUpto6_Urban
+Number of vehicle crash incidents occurred on the national highway,Count_VehicleCrashIncident_NationalHighway
+Number of vehicle crash incidents occurred on the state highway,Count_VehicleCrashIncident_StateHighway
 "Number of verified cases of killing, kidnapping, enforced disappearance, arbitrary detention and torture of journalists, associated media personnel, trade unionists and human rights advocates in the previous 12 months",dc/topic/sdg_16.10.1
 Number of veterans,Count_Person_Veteran
 "Number of victims of human trafficking per 100K population, by sex, age and form of exploitation",dc/topic/sdg_16.2.2