diff --git a/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap b/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap
index 4b1d6f079..928e7f7a7 100644
--- a/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/__snapshots__/SettingsPane.test.tsx.snap
@@ -16,54 +16,57 @@ exports[`Settings Pane should render Default properly 1`] = `
       <div
         className="settingsSectionPart"
       >
-        <Stack
-          horizontal={true}
-        >
-          <Text
-            className="settingsSectionLabel"
+        <fieldset>
+          <legend
+            className="settingsSectionLabel legendLabel"
             id="pageOptions"
-            variant="small"
           >
-            Page options
-          </Text>
+            Page Options
+          </legend>
           <InfoTooltip>
             Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many query results per page.
           </InfoTooltip>
-        </Stack>
-        <StyledChoiceGroup
-          ariaLabelledBy="pageOptions"
-          onChange={[Function]}
-          options={
-            Array [
-              Object {
-                "key": "custom",
-                "text": "Custom",
-              },
-              Object {
-                "key": "unlimited",
-                "text": "Unlimited",
-              },
-            ]
-          }
-          selectedKey="custom"
-          styles={
-            Object {
-              "flexContainer": Array [
+          <StyledChoiceGroup
+            ariaLabelledBy="pageOptions"
+            onChange={[Function]}
+            options={
+              Array [
                 Object {
-                  "selectors": Object {
-                    ".ms-ChoiceField": Object {
-                      "marginTop": 0,
-                    },
-                    ".ms-ChoiceField-wrapper label": Object {
-                      "fontSize": 12,
-                      "paddingTop": 0,
+                  "key": "custom",
+                  "text": "Custom",
+                },
+                Object {
+                  "key": "unlimited",
+                  "text": "Unlimited",
+                },
+              ]
+            }
+            selectedKey="custom"
+            styles={
+              Object {
+                "flexContainer": Array [
+                  Object {
+                    "selectors": Object {
+                      ".ms-ChoiceField": Object {
+                        "marginTop": 0,
+                      },
+                      ".ms-ChoiceField-wrapper label": Object {
+                        "fontSize": 12,
+                        "paddingTop": 0,
+                      },
+                      ".ms-ChoiceFieldGroup root-133": Object {
+                        "clear": "both",
+                      },
                     },
                   },
+                ],
+                "root": Object {
+                  "clear": "both",
                 },
-              ],
+              }
             }
-          }
-        />
+          />
+        </fieldset>
       </div>
       <div
         className="tabs settingsSectionPart"
diff --git a/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx b/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
index 71cfa9c8b..7a7878108 100644
--- a/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
+++ b/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
@@ -24,6 +24,7 @@ const {
   Ascii,
   Bigint,
   Blob,
+  Date: DateType,
   Decimal,
   Float,
   Int,
@@ -41,6 +42,7 @@ export const cassandraOptions = [
   { key: Bigint, text: Bigint },
   { key: Blob, text: Blob },
   { key: Boolean, text: Boolean },
+  { key: DateType, text: DateType },
   { key: Decimal, text: Decimal },
   { key: Double, text: Double },
   { key: Float, text: Float },
diff --git a/src/Explorer/Tables/Constants.ts b/src/Explorer/Tables/Constants.ts
index c9917dcd8..7a2aa15e1 100644
--- a/src/Explorer/Tables/Constants.ts
+++ b/src/Explorer/Tables/Constants.ts
@@ -14,6 +14,7 @@ export const CassandraType = {
   Bigint: "Bigint",
   Blob: "Blob",
   Boolean: "Boolean",
+  Date: "Date",
   Decimal: "Decimal",
   Double: "Double",
   Float: "Float",
diff --git a/src/Explorer/Tables/TableDataClient.ts b/src/Explorer/Tables/TableDataClient.ts
index 62463abfd..cc3ea8295 100644
--- a/src/Explorer/Tables/TableDataClient.ts
+++ b/src/Explorer/Tables/TableDataClient.ts
@@ -536,7 +536,8 @@ export class CassandraAPIDataClient extends TableDataClient {
       dataType === TableConstants.CassandraType.Inet ||
       dataType === TableConstants.CassandraType.Ascii ||
       dataType === TableConstants.CassandraType.Varchar ||
-      dataType === TableConstants.CassandraType.Timestamp
+      dataType === TableConstants.CassandraType.Timestamp ||
+      dataType === TableConstants.CassandraType.Date
     );
   }