diff --git a/docs/index.md b/docs/index.md
index 5575ccfb..4f4ea178 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -465,12 +465,12 @@ resource "sentry_dashboard" "main" {
 
   widget {
     title        = "Errors by Country"
-    display_type = "world_map"
+    display_type = "table"
     interval     = "5m"
     widget_type  = "discover"
 
     query {
-      fields     = ["count()"]
+      fields     = ["geo.country_code", "geo.region", "count()"]
       aggregates = ["count()"]
       conditions = "!event.type:transaction has:geo.country_code"
       order_by   = "count()"
diff --git a/docs/resources/dashboard.md b/docs/resources/dashboard.md
index 0772177e..04aadd84 100644
--- a/docs/resources/dashboard.md
+++ b/docs/resources/dashboard.md
@@ -148,12 +148,12 @@ resource "sentry_dashboard" "main" {
 
   widget {
     title        = "Errors by Country"
-    display_type = "world_map"
+    display_type = "table"
     interval     = "5m"
     widget_type  = "discover"
 
     query {
-      fields     = ["count()"]
+      fields     = ["geo.country_code", "geo.region", "count()"]
       aggregates = ["count()"]
       conditions = "!event.type:transaction has:geo.country_code"
       order_by   = "count()"
diff --git a/examples/kitchen-sink/demo.tf b/examples/kitchen-sink/demo.tf
index c3b89eb0..c7c49ca2 100644
--- a/examples/kitchen-sink/demo.tf
+++ b/examples/kitchen-sink/demo.tf
@@ -378,12 +378,12 @@ resource "sentry_dashboard" "main" {
 
   widget {
     title        = "Errors by Country"
-    display_type = "world_map"
+    display_type = "table"
     interval     = "5m"
     widget_type  = "discover"
 
     query {
-      fields     = ["count()"]
+      fields     = ["geo.country_code", "geo.region", "count()"]
       aggregates = ["count()"]
       conditions = "!event.type:transaction has:geo.country_code"
       order_by   = "count()"
diff --git a/examples/resources/sentry_dashboard/resource.tf b/examples/resources/sentry_dashboard/resource.tf
index ceac20c8..e3c9b613 100644
--- a/examples/resources/sentry_dashboard/resource.tf
+++ b/examples/resources/sentry_dashboard/resource.tf
@@ -133,12 +133,12 @@ resource "sentry_dashboard" "main" {
 
   widget {
     title        = "Errors by Country"
-    display_type = "world_map"
+    display_type = "table"
     interval     = "5m"
     widget_type  = "discover"
 
     query {
-      fields     = ["count()"]
+      fields     = ["geo.country_code", "geo.region", "count()"]
       aggregates = ["count()"]
       conditions = "!event.type:transaction has:geo.country_code"
       order_by   = "count()"
diff --git a/sentry/data_source_sentry_dashboard_test.go b/sentry/data_source_sentry_dashboard_test.go
index c08cc524..46e9460a 100644
--- a/sentry/data_source_sentry_dashboard_test.go
+++ b/sentry/data_source_sentry_dashboard_test.go
@@ -24,15 +24,17 @@ func TestAccSentryDashboardDataSource_basic(t *testing.T) {
 			resource.TestCheckResourceAttr(name, "widget.#", "1"),
 			resource.TestCheckTypeSetElemNestedAttrs(name, "widget.*", map[string]string{
 				"title":        "Custom Widget",
-				"display_type": "world_map",
+				"display_type": "table",
 			}),
 			resource.TestCheckResourceAttr(name, "widget.0.query.#", "1"),
 			resource.TestCheckTypeSetElemNestedAttrs(name, "widget.0.query.*", map[string]string{
 				"name":       "Metric",
-				"conditions": "!event.type:transaction",
+				"conditions": "!event.type:transaction has:geo.country_code",
 			}),
-			resource.TestCheckResourceAttr(name, "widget.0.query.0.fields.#", "1"),
-			resource.TestCheckResourceAttr(name, "widget.0.query.0.fields.0", "count()"),
+			resource.TestCheckResourceAttr(name, "widget.0.query.0.fields.#", "3"),
+			resource.TestCheckResourceAttr(name, "widget.0.query.0.fields.0", "geo.country_code"),
+			resource.TestCheckResourceAttr(name, "widget.0.query.0.fields.1", "geo.region"),
+			resource.TestCheckResourceAttr(name, "widget.0.query.0.fields.2", "count()"),
 			resource.TestCheckResourceAttr(name, "widget.0.query.0.aggregates.#", "1"),
 			resource.TestCheckResourceAttr(name, "widget.0.query.0.aggregates.0", "count()"),
 			resource.TestCheckResourceAttr(name, "widget.0.layout.#", "1"),
@@ -71,14 +73,14 @@ resource "sentry_dashboard" "test" {
 
 	widget {
 		title        = "Custom Widget"
-		display_type = "world_map"
+		display_type = "table"
 
 		query {
 			name       = "Metric"
 
-			fields     = ["count()"]
+			fields     = ["geo.country_code", "geo.region", "count()"]
 			aggregates = ["count()"]
-			conditions = "!event.type:transaction"
+			conditions = "!event.type:transaction has:geo.country_code"
 		}
 
 		layout {
diff --git a/sentry/data_source_sentry_metric_alert_test.go b/sentry/data_source_sentry_metric_alert_test.go
index 3d9228b5..ca800cf2 100644
--- a/sentry/data_source_sentry_metric_alert_test.go
+++ b/sentry/data_source_sentry_metric_alert_test.go
@@ -76,7 +76,7 @@ resource "sentry_metric_alert" "test" {
 	organization      = sentry_project.test.organization
 	project           = sentry_project.test.id
 	name              = "%[1]s"
-	dataset           = "transactions"
+	dataset           = "generic_metrics"
 	event_types       = ["transaction"]
 	query             = "http.url:http://testservice.com/stats"
 	aggregate         = "p50(transaction.duration)"
diff --git a/sentry/resource_sentry_dashboard.go b/sentry/resource_sentry_dashboard.go
index 0fcfcf84..4f859e8f 100644
--- a/sentry/resource_sentry_dashboard.go
+++ b/sentry/resource_sentry_dashboard.go
@@ -61,7 +61,6 @@ func resourceSentryDashboard() *schema.Resource {
 									"stacked_area",
 									"bar",
 									"table",
-									"world_map",
 									"big_number",
 									"top_n",
 								},
diff --git a/sentry/resource_sentry_dashboard_test.go b/sentry/resource_sentry_dashboard_test.go
index 0fe5a0c7..0d4d1b59 100644
--- a/sentry/resource_sentry_dashboard_test.go
+++ b/sentry/resource_sentry_dashboard_test.go
@@ -25,16 +25,18 @@ func TestAccSentryDashboard_basic(t *testing.T) {
 			resource.TestCheckResourceAttr(rn, "title", dashboardTitle),
 			resource.TestCheckResourceAttr(rn, "widget.#", "1"),
 			resource.TestCheckResourceAttr(rn, "widget.0.title", "Custom Widget"),
-			resource.TestCheckResourceAttr(rn, "widget.0.display_type", "world_map"),
+			resource.TestCheckResourceAttr(rn, "widget.0.display_type", "table"),
 			resource.TestCheckResourceAttr(rn, "widget.0.query.#", "1"),
 			resource.TestCheckResourceAttr(rn, "widget.0.query.0.name", "Metric"),
-			resource.TestCheckResourceAttr(rn, "widget.0.query.0.fields.#", "1"),
-			resource.TestCheckResourceAttr(rn, "widget.0.query.0.fields.0", "count()"),
+			resource.TestCheckResourceAttr(rn, "widget.0.query.0.fields.#", "3"),
+			resource.TestCheckResourceAttr(rn, "widget.0.query.0.fields.0", "geo.country_code"),
+			resource.TestCheckResourceAttr(rn, "widget.0.query.0.fields.1", "geo.region"),
+			resource.TestCheckResourceAttr(rn, "widget.0.query.0.fields.2", "count()"),
 			resource.TestCheckResourceAttr(rn, "widget.0.query.0.aggregates.#", "1"),
 			resource.TestCheckResourceAttr(rn, "widget.0.query.0.aggregates.0", "count()"),
 			resource.TestCheckResourceAttr(rn, "widget.0.query.0.columns.#", "0"),
 			resource.TestCheckResourceAttr(rn, "widget.0.query.0.field_aliases.#", "0"),
-			resource.TestCheckResourceAttr(rn, "widget.0.query.0.conditions", "!event.type:transaction"),
+			resource.TestCheckResourceAttr(rn, "widget.0.query.0.conditions", "!event.type:transaction has:geo.country_code"),
 			resource.TestCheckResourceAttr(rn, "widget.0.query.0.order_by", ""),
 			resource.TestCheckResourceAttrSet(rn, "widget.0.query.0.id"),
 			resource.TestCheckResourceAttrPtr(rn, "internal_id", &dashboardID),
@@ -97,14 +99,14 @@ resource "sentry_dashboard" "test" {
 
 	widget {
 		title        = "Custom Widget"
-		display_type = "world_map"
+		display_type = "table"
 
 		query {
 			name       = "Metric"
 
-			fields     = ["count()"]
+			fields     = ["geo.country_code", "geo.region", "count()"]
 			aggregates = ["count()"]
-			conditions = "!event.type:transaction"
+			conditions = "!event.type:transaction has:geo.country_code"
 		}
 
 		layout {
diff --git a/sentry/resource_sentry_metric_alert_test.go b/sentry/resource_sentry_metric_alert_test.go
index d72e1552..cafd56c9 100644
--- a/sentry/resource_sentry_metric_alert_test.go
+++ b/sentry/resource_sentry_metric_alert_test.go
@@ -27,7 +27,7 @@ func TestAccSentryMetricAlert_basic(t *testing.T) {
 			resource.TestCheckResourceAttr(rn, "project", projectName),
 			resource.TestCheckResourceAttr(rn, "name", alertName),
 			resource.TestCheckResourceAttr(rn, "environment", ""),
-			resource.TestCheckResourceAttr(rn, "dataset", "transactions"),
+			resource.TestCheckResourceAttr(rn, "dataset", "generic_metrics"),
 			resource.TestCheckResourceAttr(rn, "event_types.#", "1"),
 			resource.TestCheckResourceAttr(rn, "event_types.0", "transaction"),
 			resource.TestCheckResourceAttr(rn, "query", "http.url:http://testservice.com/stats"),
@@ -122,7 +122,7 @@ resource "sentry_metric_alert" "test" {
 	organization      = sentry_project.test.organization
 	project           = sentry_project.test.id
 	name              = "%[1]s"
-	dataset           = "transactions"
+	dataset           = "generic_metrics"
 	event_types       = ["transaction"]
 	query             = "http.url:http://testservice.com/stats"
 	aggregate         = "p50(transaction.duration)"