diff --git a/package-lock.json b/package-lock.json
index 1f996b9d..a54a7a0b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@emotion/styled": "^11.6.0",
         "@heroicons/react": "^1.0.5",
         "@lhncbc/ucum-lhc": "^4.1.5",
-        "@madie/cql-antlr-parser": "^1.0.3",
+        "@madie/cql-antlr-parser": "^1.0.4",
         "@madie/madie-auth": "^0.0.1",
         "@madie/madie-design-system": "^1.2.23",
         "@madie/madie-editor": "^0.0.1",
@@ -3138,9 +3138,9 @@
       }
     },
     "node_modules/@madie/cql-antlr-parser": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@madie/cql-antlr-parser/-/cql-antlr-parser-1.0.3.tgz",
-      "integrity": "sha512-RxQF3tBH8U3gc9AxfG4gUjNpYPGJBHw3A3DiBgaCxFLDYCyVNF5nl6KdlGko6Gx/WJBG67Ys9KMrpU+Qq1vorg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@madie/cql-antlr-parser/-/cql-antlr-parser-1.0.4.tgz",
+      "integrity": "sha512-u1iWJEKbLbQNmqBNNkp/eGwkEEoYGjj3B28ENR6wUd689N9nkaopqoDwBUgygETbreXva/CRP1r9IrGWbTOE6w==",
       "dependencies": {
         "antlr4ts": "^0.5.0-alpha.4",
         "antlr4ts-cli": "^0.5.0-alpha.4"
diff --git a/package.json b/package.json
index 9d62d792..77de4b73 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "@emotion/styled": "^11.6.0",
     "@heroicons/react": "^1.0.5",
     "@lhncbc/ucum-lhc": "^4.1.5",
-    "@madie/cql-antlr-parser": "^1.0.3",
+    "@madie/cql-antlr-parser": "^1.0.4",
     "@madie/madie-auth": "^0.0.1",
     "@madie/madie-design-system": "^1.2.23",
     "@madie/madie-editor": "^0.0.1",
diff --git a/src/components/editMeasure/populationCriteria/PopulationCriteriaHome.test.tsx b/src/components/editMeasure/populationCriteria/PopulationCriteriaHome.test.tsx
index d4d28193..62a90f70 100644
--- a/src/components/editMeasure/populationCriteria/PopulationCriteriaHome.test.tsx
+++ b/src/components/editMeasure/populationCriteria/PopulationCriteriaHome.test.tsx
@@ -336,7 +336,7 @@ describe("PopulationCriteriaHome", () => {
     ).toBeInTheDocument();
 
     expect(
-      screen.queryByText("SDE Ethnicity - Include in Report Type")
+      screen.queryByText('"SDE Ethnicity" - Include in Report Type')
     ).not.toBeInTheDocument();
   });
 
@@ -355,14 +355,14 @@ describe("PopulationCriteriaHome", () => {
 
     userEvent.click(screen.getByRole("button", { name: "Open" }));
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     expect(
-      await screen.findByText('SDE."SDE Ethnicity" - Include in Report Type')
+      await screen.findByText('"SDE Ethnicity" - Include in Report Type')
     ).toBeInTheDocument();
 
     const allComboBoxes2 = screen.getAllByRole("combobox");
@@ -403,7 +403,7 @@ describe("PopulationCriteriaHome", () => {
     ).toBeInTheDocument();
 
     expect(
-      screen.queryByText('SDE."SDE Ethnicity" - Include in Report Type')
+      screen.queryByText("SDE Ethnicity - Include in Report Type")
     ).not.toBeInTheDocument();
   });
 
@@ -422,14 +422,14 @@ describe("PopulationCriteriaHome", () => {
 
     userEvent.click(screen.getByRole("button", { name: "Open" }));
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     expect(
-      await screen.findByText('SDE."SDE Ethnicity" - Include in Report Type')
+      await screen.findByText('"SDE Ethnicity" - Include in Report Type')
     ).toBeInTheDocument();
 
     const allComboBoxes2 = screen.getAllByRole("combobox");
diff --git a/src/components/editMeasure/populationCriteria/riskAdjustment/qdm/RiskAdjustment.test.tsx b/src/components/editMeasure/populationCriteria/riskAdjustment/qdm/RiskAdjustment.test.tsx
index 44f56854..d596ac10 100644
--- a/src/components/editMeasure/populationCriteria/riskAdjustment/qdm/RiskAdjustment.test.tsx
+++ b/src/components/editMeasure/populationCriteria/riskAdjustment/qdm/RiskAdjustment.test.tsx
@@ -130,7 +130,7 @@ describe("QdmRiskAdjustment Component", () => {
         description: "",
       },
       {
-        definition: 'SDE."SDE Ethnicity"',
+        definition: '"SDE Ethnicity"',
         description: "",
       },
     ];
@@ -160,10 +160,10 @@ describe("QdmRiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -228,7 +228,7 @@ describe("QdmRiskAdjustment Component", () => {
         description: "",
       },
       {
-        definition: 'SDE."SDE Ethnicity"',
+        definition: '"SDE Ethnicity"',
         description: "",
       },
     ];
@@ -258,10 +258,10 @@ describe("QdmRiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -358,11 +358,11 @@ describe("QdmRiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     userEvent.click(riskAdjustmentButton); // To collapse the dropdown
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -411,11 +411,11 @@ describe("QdmRiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     userEvent.click(riskAdjustmentButton); // To collapse the dropdown
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -471,17 +471,17 @@ describe("QdmRiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     act(async () => {
       const deleteButton = await screen.findByTestId("CancelIcon");
       userEvent.click(deleteButton);
       expect(
-        screen.queryByRole("button", { name: 'SDE."SDE Ethnicity"' })
+        screen.queryByRole("button", { name: '"SDE Ethnicity"' })
       ).not.toBeInTheDocument();
     });
   });
diff --git a/src/components/editMeasure/populationCriteria/riskAdjustment/qiCore/RiskAdjustment.test.tsx b/src/components/editMeasure/populationCriteria/riskAdjustment/qiCore/RiskAdjustment.test.tsx
index abf3a139..098c7d6d 100644
--- a/src/components/editMeasure/populationCriteria/riskAdjustment/qiCore/RiskAdjustment.test.tsx
+++ b/src/components/editMeasure/populationCriteria/riskAdjustment/qiCore/RiskAdjustment.test.tsx
@@ -136,7 +136,7 @@ describe("QiCore RiskAdjustment Component", () => {
         includeInReportType: ["Individual"],
       },
       {
-        definition: 'SDE."SDE Ethnicity"',
+        definition: '"SDE Ethnicity"',
         description: "",
         includeInReportType: [
           "Individual",
@@ -204,10 +204,10 @@ describe("QiCore RiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -255,7 +255,7 @@ describe("QiCore RiskAdjustment Component", () => {
         description: "",
       },
       {
-        definition: 'SDE."SDE Ethnicity"',
+        definition: '"SDE Ethnicity"',
         description: "",
         includeInReportType: [
           "Individual",
@@ -291,10 +291,10 @@ describe("QiCore RiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -391,11 +391,11 @@ describe("QiCore RiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     userEvent.click(riskAdjustmentButton); // To collapse the dropdown
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -444,11 +444,11 @@ describe("QiCore RiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     userEvent.click(riskAdjustmentButton); // To collapse the dropdown
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if RA description already loads values from store and able to update
@@ -504,17 +504,17 @@ describe("QiCore RiskAdjustment Component", () => {
 
     userEvent.click(riskAdjustmentButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     act(async () => {
       const deleteButton = await screen.findByTestId("CancelIcon");
       userEvent.click(deleteButton);
       expect(
-        screen.queryByRole("button", { name: 'SDE."SDE Ethnicity"' })
+        screen.queryByRole("button", { name: '"SDE Ethnicity"' })
       ).not.toBeInTheDocument();
     });
   });
diff --git a/src/components/editMeasure/populationCriteria/supplementalData/qiCore/SupplementalData.test.tsx b/src/components/editMeasure/populationCriteria/supplementalData/qiCore/SupplementalData.test.tsx
index fe1e7ecc..563f0fd3 100644
--- a/src/components/editMeasure/populationCriteria/supplementalData/qiCore/SupplementalData.test.tsx
+++ b/src/components/editMeasure/populationCriteria/supplementalData/qiCore/SupplementalData.test.tsx
@@ -139,7 +139,7 @@ describe("SupplementalData Component QI-Core", () => {
         includeInReportType: ["Individual"],
       },
       {
-        definition: 'SDE."SDE Ethnicity"',
+        definition: '"SDE Ethnicity"',
         description: "",
         includeInReportType: [
           "Individual",
@@ -215,11 +215,11 @@ describe("SupplementalData Component QI-Core", () => {
       userEvent.click(el);
     });
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"', exact: false })
+      screen.getByRole("button", { name: '"SDE Ethnicity"', exact: false })
     ).toBeInTheDocument();
 
     const sdeEthnicityIncludeInReportTypeContainer = await screen.getByTestId(
-      'SDE."SDE Ethnicity"-include-in-report-type-dropdown',
+      '"SDE Ethnicity"-include-in-report-type-dropdown',
       { exact: true }
     );
     // check that it defaults to all values added for Include in Report Type
@@ -346,13 +346,11 @@ describe("SupplementalData Component QI-Core", () => {
 
     userEvent.click(supplementalDataButton);
     await waitFor(() => {
-      userEvent.click(
-        screen.getByText('SDE."SDE Ethnicity"', { exact: false })
-      );
+      userEvent.click(screen.getByText('"SDE Ethnicity"', { exact: false }));
     });
     userEvent.click(supplementalDataButton); // To collapse the dropdown
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"', exact: false })
+      screen.getByRole("button", { name: '"SDE Ethnicity"', exact: false })
     ).toBeInTheDocument();
 
     // Verifies if SD description already loads values from store and able to update
@@ -417,11 +415,11 @@ describe("SupplementalData Component QI-Core", () => {
 
     userEvent.click(supplementalDataButton);
     await waitFor(() => {
-      userEvent.click(screen.getByText('SDE."SDE Ethnicity"'));
+      userEvent.click(screen.getByText('"SDE Ethnicity"'));
     });
     userEvent.click(supplementalDataButton); // To collapse the dropdown
     expect(
-      screen.getByRole("button", { name: 'SDE."SDE Ethnicity"' })
+      screen.getByRole("button", { name: '"SDE Ethnicity"' })
     ).toBeInTheDocument();
 
     // Verifies if SD description already loads values from store and able to update