diff --git a/packages/sections/src/evidence/EVA/Body.jsx b/packages/sections/src/evidence/EVA/Body.jsx
index 90d7b80da..5b8a41d31 100644
--- a/packages/sections/src/evidence/EVA/Body.jsx
+++ b/packages/sections/src/evidence/EVA/Body.jsx
@@ -41,7 +41,7 @@ const exportColumns = [
   },
   {
     label: "variantId",
-    exportValue: row => row.variantId,
+    exportValue: row => row.variant.id,
   },
   {
     label: "variantRsId",
@@ -110,7 +110,7 @@ function getColumns(label) {
     {
       id: "variantId",
       label: "Variant",
-      renderCell: ({ variantId }) =>
+      renderCell: ({ variant: { id: variantId } }) =>
         // trim long IDs and append '...'
         variantId ? (
           <>
@@ -139,7 +139,8 @@ function getColumns(label) {
     {
       id: "variantHgvsId",
       label: "HGVS ID",
-      renderCell: ({ variantHgvsId }) => variantHgvsId || naLabel,
+      renderCell: ({ variant }) => variant.hgvsId || naLabel,
+      filterValue: ({ variant }) => `${variant.hgvsId}`,
     },
     {
       id: "studyId",
diff --git a/packages/sections/src/evidence/EVA/ClinvarQuery.gql b/packages/sections/src/evidence/EVA/ClinvarQuery.gql
index bbb4ba75f..42951c3a9 100644
--- a/packages/sections/src/evidence/EVA/ClinvarQuery.gql
+++ b/packages/sections/src/evidence/EVA/ClinvarQuery.gql
@@ -19,12 +19,14 @@ query ClinvarQuery($ensemblId: String!, $efoId: String!, $size: Int!, $cursor: S
           id
           name
         }
+        variant {
+          id
+          hgvsId
+        }
         variantEffect
         directionOnTrait
         diseaseFromSource
-        variantId
         variantRsId
-        variantHgvsId
         studyId
         variantFunctionalConsequence {
           id
diff --git a/packages/sections/src/evidence/EVASomatic/Body.jsx b/packages/sections/src/evidence/EVASomatic/Body.jsx
index 4ed44712f..a81725fa1 100644
--- a/packages/sections/src/evidence/EVASomatic/Body.jsx
+++ b/packages/sections/src/evidence/EVASomatic/Body.jsx
@@ -66,7 +66,7 @@ const getColumns = label => [
   {
     id: "variantId",
     label: "Variant",
-    renderCell: ({ variantId }) =>
+    renderCell: ({ variant: { id: variantId } }) =>
       variantId ? (
         <>
           {variantId.substring(0, 20)}
@@ -75,7 +75,7 @@ const getColumns = label => [
       ) : (
         naLabel
       ),
-    filterValue: ({ variantId }) => `${variantId}`,
+    filterValue: ({ variant: { id: variantId } }) => `${variantId}`,
   },
   {
     id: "variantRsId",
@@ -96,8 +96,8 @@ const getColumns = label => [
   {
     id: "variantHgvsId",
     label: "HGVS ID",
-    renderCell: ({ variantHgvsId }) => variantHgvsId || naLabel,
-    filterValue: ({ variantHgvsId }) => `${variantHgvsId}`,
+    renderCell: ({ variant }) => variant.hgvsId || naLabel,
+    filterValue: ({ variant }) => `${variant.hgvsId}`,
   },
   {
     id: "studyId",
diff --git a/packages/sections/src/evidence/EVASomatic/EvaSomaticQuery.gql b/packages/sections/src/evidence/EVASomatic/EvaSomaticQuery.gql
index 095f4178d..7fc1a8c56 100644
--- a/packages/sections/src/evidence/EVASomatic/EvaSomaticQuery.gql
+++ b/packages/sections/src/evidence/EVASomatic/EvaSomaticQuery.gql
@@ -15,12 +15,16 @@ query EvaSomaticQuery($ensemblId: String!, $efoId: String!, $size: Int!, $cursor
           id
           name
         }
+        variant {
+          hgvsId
+        }
         variantEffect
         directionOnTrait
         diseaseFromSource
-        variantId
+        variant {
+          id
+        }
         variantRsId
-        variantHgvsId
         studyId
         clinicalSignificances
         allelicRequirements