diff --git a/apps/csm-portal/backend/.env.example b/apps/csm-portal/backend/.env.example
index b00df0428e..2aa24b1dbf 100644
--- a/apps/csm-portal/backend/.env.example
+++ b/apps/csm-portal/backend/.env.example
@@ -53,8 +53,10 @@ SCIM_SCOPES=
 # restarting the backend process. Left unset or malformed, GET /dashboards
 # returns an empty list and GET /dashboards/{id} 404s for every id; startup
 # and every other endpoint work normally (an error is logged, not a crash).
-# Example (the pilot's 5 dashboards):
-# DASHBOARDS_CONFIG='[{"id":"agents_pilot","displayName":"Engineer overview","isDefault":true,"targetTeam":"cs_engineers","widgets":[{"id":"my_patches","displayName":"My Patches","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"tag","op":"in","values":["patch"]},{"field":"state","op":"in","values":["open","work_in_progress","waiting_on_wso2","reopened","awaiting_info"]}]}},{"id":"my_reminders","displayName":"My Reminders","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"state","op":"in","values":["awaiting_info","solution_proposed"]}]}},{"id":"open_incident_team","displayName":"Open Incident (Team)","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"tag","op":"in","values":["s_dip"]},{"field":"state","op":"in","values":["work_in_progress","open","waiting_on_wso2","reopened"]}]}},{"id":"my_critical_open","displayName":"My Critical & High Cases","resourceType":"case","shape":"list","gridWidth":3,"listLimit":5,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"severity","op":"in","values":["catastrophic","critical"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}}]},{"id":"operations","displayName":"Operations","targetTeam":"cs_operations","widgets":[{"id":"p0_p1_open","displayName":"P0/P1 Open","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"severity","op":"in","values":["catastrophic","critical"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}},{"id":"open_critical_incidents","displayName":"Open Critical Incidents","resourceType":"incident","shape":"count","gridWidth":4,"filters":{"priorities":["CRITICAL","HIGH"]}},{"id":"crs_awaiting_approval","displayName":"CRs Awaiting Approval","resourceType":"change_request","shape":"count","gridWidth":4,"filters":{"states":["customer_approval"]}}]},{"id":"iam","displayName":"IAM CS","targetTeam":"iam_cs","widgets":[{"id":"iam_open_cases","displayName":"IAM Open Cases","resourceType":"case","shape":"count","gridWidth":6,"filters":{"filters":[{"field":"tag","op":"in","values":["iam"]},{"field":"state","op":"in","values":["open","work_in_progress","awaiting_info"]}]}},{"id":"asgardeo_open_cases","displayName":"Asgardeo Open Cases","resourceType":"case","shape":"count","gridWidth":6,"filters":{"filters":[{"field":"tag","op":"in","values":["asgardeo"]},{"field":"state","op":"in","values":["open","work_in_progress","awaiting_info"]}]}}]},{"id":"security","displayName":"Security center","targetTeam":"security","widgets":[{"id":"critical_vulns","displayName":"Critical Vulnerabilities","resourceType":"product_vulnerability","shape":"count","gridWidth":4,"filters":{"priority":"critical"}},{"id":"high_vulns","displayName":"High Vulnerabilities","resourceType":"product_vulnerability","shape":"count","gridWidth":4,"filters":{"priority":"high"}},{"id":"sra_cases_open","displayName":"Open SRAs","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"type","op":"in","values":["security_report_analysis"]},{"field":"state","op":"in","values":["open","work_in_progress","awaiting_info"]}]}}]},{"id":"team_performance","displayName":"Team performance","targetTeam":"cs_team_leads","isTeamBased":true,"widgets":[{"id":"time_cards_pending_approval","displayName":"Time Cards Pending Approval","resourceType":"time_card","shape":"count","gridWidth":6,"filters":{"states":["pending"]}},{"id":"team_open_cases","displayName":"Team Open P0/P1","resourceType":"case","shape":"count","gridWidth":6,"filters":{"filters":[{"field":"severity","op":"in","values":["catastrophic","critical"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}}]}]'
+# Example (illustrative only — a real deployment's value is set directly in
+# its own environment, not committed here, and is not required to resemble
+# this shape beyond the schema):
+# DASHBOARDS_CONFIG='[{"id":"sample-dashboard","displayName":"Sample Dashboard","isDefault":true,"targetTeam":"sample-team","widgets":[{"id":"my-open-cases","displayName":"My Open Cases","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}},{"id":"recent-cases","displayName":"Recent Cases","resourceType":"case","shape":"list","gridWidth":6,"listLimit":5,"filters":{"filters":[{"field":"tag","op":"in","values":["example-tag"]},{"field":"tag","op":"notIn","values":["excluded-example-tag"]}]}},{"id":"pending-time-cards","displayName":"Pending Time Cards","resourceType":"time_card","shape":"count","gridWidth":3,"filters":{"states":["pending"]}}]},{"id":"sample-team-dashboard","displayName":"Sample Team Dashboard","targetTeam":"sample-team","isTeamBased":true,"widgets":[{"id":"team-open-cases","displayName":"Team Open Cases","section":"Overview","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"severity","op":"in","values":["critical","high"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}},{"id":"unassigned-cases","displayName":"Unassigned Cases","section":"Overview","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"assignedUserId","op":"isEmpty"},{"field":"state","op":"in","values":["open"]}]}},{"id":"cases-by-severity","displayName":"Cases by Severity","description":"Share of active cases at each severity level.","resourceType":"case","shape":"pie","gridWidth":4,"filters":{"filters":[{"field":"state","op":"in","values":["open","work_in_progress"]}]},"slices":[{"label":"Critical","color":"error","filters":{"filters":[{"field":"severity","op":"in","values":["critical"]}]}},{"label":"Mine","filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]}]}}]}]}]'
 
 # Auth — set to false for local testing (skips JWT signature verification)
 AUTH_JWKS_ENDPOINT=
diff --git a/apps/csm-portal/backend/internal/dashboard/widgets_test.go b/apps/csm-portal/backend/internal/dashboard/widgets_test.go
index 53755a464c..20147acd1a 100644
--- a/apps/csm-portal/backend/internal/dashboard/widgets_test.go
+++ b/apps/csm-portal/backend/internal/dashboard/widgets_test.go
@@ -44,21 +44,21 @@ func TestParseDashboardsConfig_MalformedShape(t *testing.T) {
 func TestParseDashboardsConfig_ValidRoundTrip(t *testing.T) {
 	const raw = `[
 		{
-			"id": "agents_pilot",
-			"displayName": "Engineer overview",
+			"id": "sample-dashboard",
+			"displayName": "Sample Dashboard",
 			"isDefault": true,
-			"targetTeam": "cs_engineers",
+			"targetTeam": "sample-team",
 			"widgets": [
 				{
-					"id": "my_patches",
-					"displayName": "My Patches",
+					"id": "my-open-cases",
+					"displayName": "My Open Cases",
 					"resourceType": "case",
 					"shape": "count",
 					"gridWidth": 3,
 					"filters": {
 						"filters": [
 							{"field": "assignedUserId", "op": "in", "values": ["__current_user__"]},
-							{"field": "tag", "op": "in", "values": ["patch"]},
+							{"field": "tag", "op": "in", "values": ["example-tag"]},
 							{"field": "state", "op": "in", "values": ["open", "work_in_progress"]}
 						]
 					}
@@ -73,25 +73,25 @@ func TestParseDashboardsConfig_ValidRoundTrip(t *testing.T) {
 	}
 
 	d := got[0]
-	if d.ID != "agents_pilot" {
-		t.Errorf("Dashboard.ID = %q, want %q", d.ID, "agents_pilot")
+	if d.ID != "sample-dashboard" {
+		t.Errorf("Dashboard.ID = %q, want %q", d.ID, "sample-dashboard")
 	}
-	if d.DisplayName != "Engineer overview" {
-		t.Errorf("Dashboard.DisplayName = %q, want %q", d.DisplayName, "Engineer overview")
+	if d.DisplayName != "Sample Dashboard" {
+		t.Errorf("Dashboard.DisplayName = %q, want %q", d.DisplayName, "Sample Dashboard")
 	}
 	if !d.IsDefault {
 		t.Errorf("Dashboard.IsDefault = false, want true")
 	}
-	if d.TargetTeam != "cs_engineers" {
-		t.Errorf("Dashboard.TargetTeam = %q, want %q", d.TargetTeam, "cs_engineers")
+	if d.TargetTeam != "sample-team" {
+		t.Errorf("Dashboard.TargetTeam = %q, want %q", d.TargetTeam, "sample-team")
 	}
 	if len(d.Widgets) != 1 {
 		t.Fatalf("len(Dashboard.Widgets) = %d, want 1", len(d.Widgets))
 	}
 
 	w := d.Widgets[0]
-	if w.ID != "my_patches" {
-		t.Errorf("WidgetTemplate.ID = %q, want %q", w.ID, "my_patches")
+	if w.ID != "my-open-cases" {
+		t.Errorf("WidgetTemplate.ID = %q, want %q", w.ID, "my-open-cases")
 	}
 	if w.ResourceType != ResourceCase {
 		t.Errorf("WidgetTemplate.ResourceType = %q, want %q", w.ResourceType, ResourceCase)
@@ -147,12 +147,12 @@ func TestParseDashboardsConfig_ValidRoundTrip(t *testing.T) {
 func TestParseDashboardsConfig_PieWidgetSlicesAndDescription(t *testing.T) {
 	const raw = `[
 		{
-			"id": "team_performance",
-			"displayName": "Team performance",
+			"id": "sample-team-dashboard",
+			"displayName": "Sample Team Dashboard",
 			"widgets": [
 				{
-					"id": "cases_by_severity",
-					"displayName": "Cases by severity",
+					"id": "cases-by-severity",
+					"displayName": "Cases by Severity",
 					"description": "Share of active cases at each severity level.",
 					"resourceType": "case",
 					"shape": "pie",
@@ -199,11 +199,11 @@ func TestParseDashboardsConfig_PieWidgetSlicesAndDescription(t *testing.T) {
 func TestParseDashboardsConfig_WidgetSection(t *testing.T) {
 	const raw = `[
 		{
-			"id": "team_performance",
-			"displayName": "Team performance",
+			"id": "sample-team-dashboard",
+			"displayName": "Sample Team Dashboard",
 			"widgets": [
-				{"id": "team_open_cases", "displayName": "Team Open P0/P1", "resourceType": "case", "shape": "count", "gridWidth": 6, "filters": {}},
-				{"id": "incident_wow", "displayName": "Incident WOW", "section": "SLA Violation", "resourceType": "incident", "shape": "count", "gridWidth": 6, "filters": {}}
+				{"id": "team-open-cases", "displayName": "Team Open Cases", "resourceType": "case", "shape": "count", "gridWidth": 6, "filters": {}},
+				{"id": "escalated-incidents", "displayName": "Escalated Incidents", "section": "Escalations", "resourceType": "incident", "shape": "count", "gridWidth": 6, "filters": {}}
 			]
 		}
 	]`
@@ -214,9 +214,9 @@ func TestParseDashboardsConfig_WidgetSection(t *testing.T) {
 	}
 
 	if section := got[0].Widgets[0].Section; section != "" {
-		t.Errorf("team_open_cases.Section = %q, want empty (no section configured)", section)
+		t.Errorf("team-open-cases.Section = %q, want empty (no section configured)", section)
 	}
-	if section := got[0].Widgets[1].Section; section != "SLA Violation" {
-		t.Errorf("incident_wow.Section = %q, want %q", section, "SLA Violation")
+	if section := got[0].Widgets[1].Section; section != "Escalations" {
+		t.Errorf("escalated-incidents.Section = %q, want %q", section, "Escalations")
 	}
 }
diff --git a/apps/csm-portal/backend/internal/handler/dashboards_test.go b/apps/csm-portal/backend/internal/handler/dashboards_test.go
index 1b03de2d10..886308be43 100644
--- a/apps/csm-portal/backend/internal/handler/dashboards_test.go
+++ b/apps/csm-portal/backend/internal/handler/dashboards_test.go
@@ -31,42 +31,34 @@ import (
 	"github.com/wso2-open-operations/cs-tools/apps/csm-portal/backend/internal/dashboard"
 )
 
-// testDashboardsConfigJSON is the pilot's 5-dashboard registry, identical to
-// the DASHBOARDS_CONFIG example documented in .env.example. dashboard.Dashboards
-// is populated from DASHBOARDS_CONFIG only in cmd/server/main.go, which tests
-// never run, so TestMain below seeds it directly via the same parse function
-// production uses — every assertion in this file exercises the real
-// production parsing/lookup/resolution path, just with the config supplied
-// in-process instead of via the environment.
+// testDashboardsConfigJSON is a small, entirely dummy 2-dashboard fixture —
+// generic names/ids only, no real WSO2 CS-team structure — extended slightly
+// beyond the DASHBOARDS_CONFIG example documented in .env.example (which has
+// the same two dashboards) with two additional widgets (an "incident"-typed
+// widget with empty filters and a "change_request"-typed widget) purely to
+// keep this file's resourceType-diversity and scalar-filter test coverage,
+// since the trimmed .env.example example doesn't need those shapes to make
+// its point. dashboard.Dashboards is populated from DASHBOARDS_CONFIG only in
+// cmd/server/main.go, which tests never run, so TestMain below seeds it
+// directly via the same parse function production uses — every assertion in
+// this file exercises the real production parsing/lookup/resolution path,
+// just with the config supplied in-process instead of via the environment.
 const testDashboardsConfigJSON = `[
-  {"id":"agents_pilot","displayName":"Engineer overview","isDefault":true,"targetTeam":"cs_engineers","widgets":[
-    {"id":"my_patches","displayName":"My Patches","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"tag","op":"in","values":["patch"]},{"field":"state","op":"in","values":["open","work_in_progress","waiting_on_wso2","reopened","awaiting_info"]}]}},
-    {"id":"my_reminders","displayName":"My Reminders","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"state","op":"in","values":["awaiting_info","solution_proposed"]}]}},
-    {"id":"open_incident_team","displayName":"Open Incident (Team)","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"tag","op":"in","values":["s_dip"]},{"field":"state","op":"in","values":["work_in_progress","open","waiting_on_wso2","reopened"]}]}},
-    {"id":"my_critical_open","displayName":"My Critical & High Cases","resourceType":"case","shape":"list","gridWidth":3,"listLimit":5,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"severity","op":"in","values":["catastrophic","critical"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}}
+  {"id":"sample-dashboard","displayName":"Sample Dashboard","isDefault":true,"targetTeam":"sample-team","widgets":[
+    {"id":"my-open-cases","displayName":"My Open Cases","resourceType":"case","shape":"count","gridWidth":3,"filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}},
+    {"id":"recent-cases","displayName":"Recent Cases","resourceType":"case","shape":"list","gridWidth":6,"listLimit":5,"filters":{"filters":[{"field":"tag","op":"in","values":["example-tag"]},{"field":"tag","op":"notIn","values":["excluded-example-tag"]}]}},
+    {"id":"pending-time-cards","displayName":"Pending Time Cards","resourceType":"time_card","shape":"count","gridWidth":3,"filters":{"states":["pending"]}},
+    {"id":"open-vulnerabilities","displayName":"Open Vulnerabilities","resourceType":"product_vulnerability","shape":"count","gridWidth":3,"filters":{"priority":"high"}}
   ]},
-  {"id":"operations","displayName":"Operations","targetTeam":"cs_operations","widgets":[
-    {"id":"p0_p1_open","displayName":"P0/P1 Open","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"severity","op":"in","values":["catastrophic","critical"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}},
-    {"id":"open_critical_incidents","displayName":"Open Critical Incidents","resourceType":"incident","shape":"count","gridWidth":4,"filters":{"priorities":["CRITICAL","HIGH"]}},
-    {"id":"crs_awaiting_approval","displayName":"CRs Awaiting Approval","resourceType":"change_request","shape":"count","gridWidth":4,"filters":{"states":["customer_approval"]}}
-  ]},
-  {"id":"iam","displayName":"IAM CS","targetTeam":"iam_cs","widgets":[
-    {"id":"iam_open_cases","displayName":"IAM Open Cases","resourceType":"case","shape":"count","gridWidth":6,"filters":{"filters":[{"field":"tag","op":"in","values":["iam"]},{"field":"state","op":"in","values":["open","work_in_progress","awaiting_info"]}]}},
-    {"id":"asgardeo_open_cases","displayName":"Asgardeo Open Cases","resourceType":"case","shape":"count","gridWidth":6,"filters":{"filters":[{"field":"tag","op":"in","values":["asgardeo"]},{"field":"state","op":"in","values":["open","work_in_progress","awaiting_info"]}]}}
-  ]},
-  {"id":"security","displayName":"Security center","targetTeam":"security","widgets":[
-    {"id":"critical_vulns","displayName":"Critical Vulnerabilities","resourceType":"product_vulnerability","shape":"count","gridWidth":4,"filters":{"priority":"critical"}},
-    {"id":"high_vulns","displayName":"High Vulnerabilities","resourceType":"product_vulnerability","shape":"count","gridWidth":4,"filters":{"priority":"high"}},
-    {"id":"sra_cases_open","displayName":"Open SRAs","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"type","op":"in","values":["security_report_analysis"]},{"field":"state","op":"in","values":["open","work_in_progress","awaiting_info"]}]}}
-  ]},
-  {"id":"team_performance","displayName":"Team performance","targetTeam":"cs_team_leads","isTeamBased":true,"widgets":[
-    {"id":"time_cards_pending_approval","displayName":"Time Cards Pending Approval","resourceType":"time_card","shape":"count","gridWidth":6,"filters":{"states":["pending"]}},
-    {"id":"team_open_cases","displayName":"Team Open P0/P1","resourceType":"case","shape":"count","gridWidth":6,"filters":{"filters":[{"field":"severity","op":"in","values":["catastrophic","critical"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}},
-    {"id":"cases_by_severity","displayName":"Cases by severity","description":"Share of active cases at each severity level.","resourceType":"case","shape":"pie","gridWidth":6,"filters":{"filters":[{"field":"state","op":"in","values":["open","work_in_progress"]}]},"slices":[
+  {"id":"sample-team-dashboard","displayName":"Sample Team Dashboard","targetTeam":"sample-team","isTeamBased":true,"widgets":[
+    {"id":"team-open-cases","displayName":"Team Open Cases","section":"Overview","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"severity","op":"in","values":["critical","high"]},{"field":"state","op":"in","values":["open","work_in_progress"]}]}},
+    {"id":"unassigned-cases","displayName":"Unassigned Cases","section":"Overview","resourceType":"case","shape":"count","gridWidth":4,"filters":{"filters":[{"field":"assignedUserId","op":"isEmpty"},{"field":"state","op":"in","values":["open"]}]}},
+    {"id":"cases-by-severity","displayName":"Cases by Severity","description":"Share of active cases at each severity level.","resourceType":"case","shape":"pie","gridWidth":4,"filters":{"filters":[{"field":"state","op":"in","values":["open","work_in_progress"]}]},"slices":[
       {"label":"Critical","color":"error","filters":{"filters":[{"field":"severity","op":"in","values":["critical"]}]}},
       {"label":"Mine","filters":{"filters":[{"field":"assignedUserId","op":"in","values":["__current_user__"]}]}}
     ]},
-    {"id":"incident_wow","displayName":"Incident WOW","section":"SLA Violation","resourceType":"incident","shape":"count","gridWidth":6,"filters":{}}
+    {"id":"escalated-incidents","displayName":"Escalated Incidents","section":"Escalations","resourceType":"incident","shape":"count","gridWidth":4,"filters":{}},
+    {"id":"pending-change-requests","displayName":"Pending Change Requests","resourceType":"change_request","shape":"count","gridWidth":4,"filters":{"states":["customer_approval"]}}
   ]}
 ]`
 
@@ -99,8 +91,8 @@ func filterValuesByField(filters map[string]any, field string) ([]any, bool) {
 // themselves via the same ParseDashboardsConfig function.
 func TestMain(m *testing.M) {
 	dashboard.Dashboards = dashboard.ParseDashboardsConfig(testDashboardsConfigJSON)
-	if len(dashboard.Dashboards) != 5 {
-		panic(fmt.Sprintf("TestMain: seeding dashboard.Dashboards failed, got %d dashboards, want 5", len(dashboard.Dashboards)))
+	if len(dashboard.Dashboards) != 2 {
+		panic(fmt.Sprintf("TestMain: seeding dashboard.Dashboards failed, got %d dashboards, want 2", len(dashboard.Dashboards)))
 	}
 	os.Exit(m.Run())
 }
@@ -225,25 +217,26 @@ func TestGetDashboards(t *testing.T) {
 			}
 		}
 
+		wantTeamBased := map[string]bool{"sample-team-dashboard": true}
 		teamBasedCount := 0
 		for _, res := range results {
 			if res.IsTeamBased {
 				teamBasedCount++
-				if res.ID != "team_performance" {
-					t.Errorf("unexpected team-based dashboard %q, want team_performance", res.ID)
+				if !wantTeamBased[res.ID] {
+					t.Errorf("unexpected team-based dashboard %q, want sample-team-dashboard", res.ID)
 				}
 			}
 		}
-		if teamBasedCount != 1 {
-			t.Errorf("teamBasedCount = %d, want exactly 1 (team_performance)", teamBasedCount)
+		if teamBasedCount != len(wantTeamBased) {
+			t.Errorf("teamBasedCount = %d, want exactly %d (sample-team-dashboard)", teamBasedCount, len(wantTeamBased))
 		}
 
 		defaultCount := 0
 		for _, res := range results {
 			if res.IsDefault {
 				defaultCount++
-				if res.ID != "agents_pilot" {
-					t.Errorf("unexpected default dashboard %q, want agents_pilot", res.ID)
+				if res.ID != "sample-dashboard" {
+					t.Errorf("unexpected default dashboard %q, want sample-dashboard", res.ID)
 				}
 			}
 		}
@@ -256,8 +249,8 @@ func TestGetDashboards(t *testing.T) {
 // TestAllDashboardsHaveWidgets is the "no more mock/empty placeholders"
 // guarantee: every dashboard in the registry now has real widgets.
 func TestAllDashboardsHaveWidgets(t *testing.T) {
-	if len(dashboard.Dashboards) != 5 {
-		t.Fatalf("len(dashboard.Dashboards) = %d, want 5", len(dashboard.Dashboards))
+	if len(dashboard.Dashboards) != 2 {
+		t.Fatalf("len(dashboard.Dashboards) = %d, want 2", len(dashboard.Dashboards))
 	}
 	for _, d := range dashboard.Dashboards {
 		if len(d.Widgets) == 0 {
@@ -269,7 +262,7 @@ func TestAllDashboardsHaveWidgets(t *testing.T) {
 func TestGetDashboardDetail(t *testing.T) {
 	t.Run("requires authenticated user", func(t *testing.T) {
 		h := NewDashboardHandler(&mockEntityUserClient{})
-		r := withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/agents_pilot", nil), "agents_pilot")
+		r := withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-dashboard", nil), "sample-dashboard")
 		w := httptest.NewRecorder()
 		h.GetDashboardDetail(w, r)
 		assertStatus(t, w, http.StatusUnauthorized)
@@ -286,9 +279,9 @@ func TestGetDashboardDetail(t *testing.T) {
 		assertErrorMessage(t, w, ErrMsgNotFound)
 	})
 
-	t.Run("agents_pilot returns metadata and its four widgets", func(t *testing.T) {
+	t.Run("sample-dashboard returns metadata and its four widgets", func(t *testing.T) {
 		h := NewDashboardHandler(&mockEntityUserClient{})
-		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/agents_pilot", nil), "agents_pilot"))
+		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-dashboard", nil), "sample-dashboard"))
 		w := httptest.NewRecorder()
 		h.GetDashboardDetail(w, r)
 
@@ -296,7 +289,7 @@ func TestGetDashboardDetail(t *testing.T) {
 		assertContentType(t, w, "application/json")
 
 		body := w.Body.Bytes()
-		t.Logf("GET /dashboards/agents_pilot response: %s", body)
+		t.Logf("GET /dashboards/sample-dashboard response: %s", body)
 
 		// Decode into the real production type (dashboardDetailView, defined
 		// in dashboards.go), not a duplicate ad hoc struct — a JSON tag
@@ -308,17 +301,17 @@ func TestGetDashboardDetail(t *testing.T) {
 			t.Fatalf("decode response body: %v; raw: %s", err, body)
 		}
 
-		if result.ID != "agents_pilot" {
-			t.Errorf("ID = %q, want %q", result.ID, "agents_pilot")
+		if result.ID != "sample-dashboard" {
+			t.Errorf("ID = %q, want %q", result.ID, "sample-dashboard")
 		}
-		if result.DisplayName != "Engineer overview" {
-			t.Errorf("DisplayName = %q, want %q", result.DisplayName, "Engineer overview")
+		if result.DisplayName != "Sample Dashboard" {
+			t.Errorf("DisplayName = %q, want %q", result.DisplayName, "Sample Dashboard")
 		}
 		if !result.IsDefault {
 			t.Errorf("IsDefault = %v, want true", result.IsDefault)
 		}
-		if result.TargetTeam != "cs_engineers" {
-			t.Errorf("TargetTeam = %q, want %q", result.TargetTeam, "cs_engineers")
+		if result.TargetTeam != "sample-team" {
+			t.Errorf("TargetTeam = %q, want %q", result.TargetTeam, "sample-team")
 		}
 		if len(result.Widgets) != 4 {
 			t.Fatalf("len(result.Widgets) = %d, want 4", len(result.Widgets))
@@ -358,10 +351,10 @@ func TestGetDashboardDetail(t *testing.T) {
 			shape        dashboard.Shape
 			gridWidth    int
 		}{
-			"my_patches":         {dashboard.ResourceCase, dashboard.ShapeCount, 3},
-			"my_reminders":       {dashboard.ResourceCase, dashboard.ShapeCount, 3},
-			"open_incident_team": {dashboard.ResourceCase, dashboard.ShapeCount, 3},
-			"my_critical_open":   {dashboard.ResourceCase, dashboard.ShapeList, 3},
+			"my-open-cases":        {dashboard.ResourceCase, dashboard.ShapeCount, 3},
+			"recent-cases":         {dashboard.ResourceCase, dashboard.ShapeList, 6},
+			"pending-time-cards":   {dashboard.ResourceTimeCard, dashboard.ShapeCount, 3},
+			"open-vulnerabilities": {dashboard.ResourceProductVulnerability, dashboard.ShapeCount, 3},
 		}
 		for id, want := range wantResourceShape {
 			idx, ok := byID[id]
@@ -380,61 +373,46 @@ func TestGetDashboardDetail(t *testing.T) {
 			}
 		}
 
-		if idx := byID["my_critical_open"]; result.Widgets[idx].ListLimit != 5 {
-			t.Errorf("widget my_critical_open listLimit = %d, want 5", result.Widgets[idx].ListLimit)
+		if idx := byID["recent-cases"]; result.Widgets[idx].ListLimit != 5 {
+			t.Errorf("widget recent-cases listLimit = %d, want 5", result.Widgets[idx].ListLimit)
 		}
 
-		for _, id := range []string{"my_patches", "my_reminders"} {
-			idx, ok := byID[id]
-			if !ok {
-				t.Fatalf("missing widget %q in response", id)
-			}
-			filters := result.Widgets[idx].Filters
-			assigned, present := filterValuesByField(filters, "assignedUserId")
-			if !present {
-				t.Fatalf("widget %s filters has no assignedUserId field entry", id)
-			}
-			if len(assigned) != 1 || assigned[0] != resolvedCurrentUserID {
-				t.Errorf("widget %s assignedUserId values = %v, want [%q]", id, assigned, resolvedCurrentUserID)
-			}
-			for _, uid := range assigned {
-				if uid == "__current_user__" {
-					t.Errorf("widget %s assignedUserId values leaked the unresolved placeholder", id)
-				}
-			}
-		}
-
-		// open_incident_team has no assignedUserId filter entry in its
-		// template and must not gain one during substitution:
-		// substituteCurrentUser only rewrites values already present, it
-		// never adds entries.
-		teamIdx, ok := byID["open_incident_team"]
+		// my-open-cases carries an assignedUserId filter (the current user's
+		// open cases) — verify __current_user__ resolved to a concrete id,
+		// not the raw placeholder.
+		openIdx, ok := byID["my-open-cases"]
 		if !ok {
-			t.Fatalf("missing widget %q in response", "open_incident_team")
+			t.Fatalf("missing widget %q in response", "my-open-cases")
+		}
+		assigned, present := filterValuesByField(result.Widgets[openIdx].Filters, "assignedUserId")
+		if !present {
+			t.Fatalf("widget my-open-cases filters has no assignedUserId field entry")
 		}
-		teamFilters := result.Widgets[teamIdx].Filters
-		if v, present := filterValuesByField(teamFilters, "assignedUserId"); present {
-			t.Errorf("widget open_incident_team filters unexpectedly has an assignedUserId field entry: %v", v)
+		if len(assigned) != 1 || assigned[0] != resolvedCurrentUserID {
+			t.Errorf("widget my-open-cases assignedUserId values = %v, want [%q]", assigned, resolvedCurrentUserID)
+		}
+		for _, uid := range assigned {
+			if uid == "__current_user__" {
+				t.Errorf("widget my-open-cases assignedUserId values leaked the unresolved placeholder")
+			}
 		}
 
-		// my_critical_open DOES carry an assignedUserId filter (the current
-		// user's critical/high cases) — verify it resolved cleanly.
-		criticalIdx, ok := byID["my_critical_open"]
+		// recent-cases has no assignedUserId filter entry in its template and
+		// must not gain one during substitution: substituteCurrentUser only
+		// rewrites values already present, it never adds entries.
+		recentIdx, ok := byID["recent-cases"]
 		if !ok {
-			t.Fatalf("missing widget %q in response", "my_critical_open")
+			t.Fatalf("missing widget %q in response", "recent-cases")
 		}
-		assigned, present := filterValuesByField(result.Widgets[criticalIdx].Filters, "assignedUserId")
-		if !present {
-			t.Fatalf("widget my_critical_open filters has no assignedUserId field entry")
-		}
-		if len(assigned) != 1 || assigned[0] != resolvedCurrentUserID {
-			t.Errorf("widget my_critical_open assignedUserId values = %v, want [%q]", assigned, resolvedCurrentUserID)
+		recentFilters := result.Widgets[recentIdx].Filters
+		if v, present := filterValuesByField(recentFilters, "assignedUserId"); present {
+			t.Errorf("widget recent-cases filters unexpectedly has an assignedUserId field entry: %v", v)
 		}
 	})
 
-	t.Run("operations dashboard has three resource-type-diverse widgets", func(t *testing.T) {
+	t.Run("sample-team-dashboard has resource-type-diverse widgets (case, incident, change_request)", func(t *testing.T) {
 		h := NewDashboardHandler(&mockEntityUserClient{})
-		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/operations", nil), "operations"))
+		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-team-dashboard", nil), "sample-team-dashboard"))
 		w := httptest.NewRecorder()
 		h.GetDashboardDetail(w, r)
 
@@ -447,14 +425,14 @@ func TestGetDashboardDetail(t *testing.T) {
 		if err := json.Unmarshal(body, &result); err != nil {
 			t.Fatalf("decode response body: %v; raw: %s", err, body)
 		}
-		if result.ID != "operations" {
-			t.Errorf("ID = %q, want %q", result.ID, "operations")
+		if result.ID != "sample-team-dashboard" {
+			t.Errorf("ID = %q, want %q", result.ID, "sample-team-dashboard")
 		}
-		if result.TargetTeam != "cs_operations" {
-			t.Errorf("TargetTeam = %q, want %q", result.TargetTeam, "cs_operations")
+		if result.TargetTeam != "sample-team" {
+			t.Errorf("TargetTeam = %q, want %q", result.TargetTeam, "sample-team")
 		}
-		if len(result.Widgets) != 3 {
-			t.Fatalf("len(result.Widgets) = %d, want 3", len(result.Widgets))
+		if len(result.Widgets) != 5 {
+			t.Fatalf("len(result.Widgets) = %d, want 5", len(result.Widgets))
 		}
 
 		byID := make(map[string]dashboardWidgetView)
@@ -463,9 +441,9 @@ func TestGetDashboardDetail(t *testing.T) {
 		}
 
 		wantTypes := map[string]dashboard.ResourceType{
-			"p0_p1_open":              dashboard.ResourceCase,
-			"open_critical_incidents": dashboard.ResourceIncident,
-			"crs_awaiting_approval":   dashboard.ResourceChangeRequest,
+			"team-open-cases":         dashboard.ResourceCase,
+			"escalated-incidents":     dashboard.ResourceIncident,
+			"pending-change-requests": dashboard.ResourceChangeRequest,
 		}
 		for id, wantType := range wantTypes {
 			got, ok := byID[id]
@@ -477,23 +455,23 @@ func TestGetDashboardDetail(t *testing.T) {
 			}
 		}
 
-		incident, ok := byID["open_critical_incidents"]
+		changeRequest, ok := byID["pending-change-requests"]
 		if !ok {
-			t.Fatalf("missing widget %q in response", "open_critical_incidents")
+			t.Fatalf("missing widget %q in response", "pending-change-requests")
 		}
-		prioritiesRaw, present := incident.Filters["priorities"]
+		statesRaw, present := changeRequest.Filters["states"]
 		if !present {
-			t.Fatalf("open_critical_incidents filters has no priorities key: %v", incident.Filters)
+			t.Fatalf("pending-change-requests filters has no states key: %v", changeRequest.Filters)
 		}
-		priorities, ok := prioritiesRaw.([]any)
-		if !ok || len(priorities) != 2 || priorities[0] != "CRITICAL" || priorities[1] != "HIGH" {
-			t.Errorf("open_critical_incidents filters.priorities = %v, want [CRITICAL HIGH] unmodified", prioritiesRaw)
+		states, ok := statesRaw.([]any)
+		if !ok || len(states) != 1 || states[0] != "customer_approval" {
+			t.Errorf("pending-change-requests filters.states = %v, want [customer_approval] unmodified", statesRaw)
 		}
 	})
 
-	t.Run("security dashboard's product_vulnerability widget has a scalar string filter", func(t *testing.T) {
+	t.Run("sample-dashboard's product_vulnerability widget has a scalar string filter", func(t *testing.T) {
 		h := NewDashboardHandler(&mockEntityUserClient{})
-		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/security", nil), "security"))
+		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-dashboard", nil), "sample-dashboard"))
 		w := httptest.NewRecorder()
 		h.GetDashboardDetail(w, r)
 
@@ -501,14 +479,14 @@ func TestGetDashboardDetail(t *testing.T) {
 		assertContentType(t, w, "application/json")
 
 		body := w.Body.Bytes()
-		t.Logf("GET /dashboards/security response: %s", body)
+		t.Logf("GET /dashboards/sample-dashboard response: %s", body)
 
 		var result dashboardDetailView
 		if err := json.Unmarshal(body, &result); err != nil {
 			t.Fatalf("decode response body: %v; raw: %s", err, body)
 		}
-		if len(result.Widgets) != 3 {
-			t.Fatalf("len(result.Widgets) = %d, want 3", len(result.Widgets))
+		if len(result.Widgets) != 4 {
+			t.Fatalf("len(result.Widgets) = %d, want 4", len(result.Widgets))
 		}
 
 		byID := make(map[string]dashboardWidgetView)
@@ -516,31 +494,31 @@ func TestGetDashboardDetail(t *testing.T) {
 			byID[wd.WidgetID] = wd
 		}
 
-		critical, ok := byID["critical_vulns"]
+		vulns, ok := byID["open-vulnerabilities"]
 		if !ok {
-			t.Fatalf("missing widget %q in response", "critical_vulns")
+			t.Fatalf("missing widget %q in response", "open-vulnerabilities")
 		}
-		if critical.ResourceType != dashboard.ResourceProductVulnerability {
-			t.Errorf("critical_vulns resourceType = %q, want %q", critical.ResourceType, dashboard.ResourceProductVulnerability)
+		if vulns.ResourceType != dashboard.ResourceProductVulnerability {
+			t.Errorf("open-vulnerabilities resourceType = %q, want %q", vulns.ResourceType, dashboard.ResourceProductVulnerability)
 		}
-		priority, present := critical.Filters["priority"]
+		priority, present := vulns.Filters["priority"]
 		if !present {
-			t.Fatalf("critical_vulns filters has no priority key: %v", critical.Filters)
+			t.Fatalf("open-vulnerabilities filters has no priority key: %v", vulns.Filters)
 		}
-		if s, ok := priority.(string); !ok || s != "critical" {
-			t.Errorf("critical_vulns filters.priority = %v (%T), want string %q", priority, priority, "critical")
+		if s, ok := priority.(string); !ok || s != "high" {
+			t.Errorf("open-vulnerabilities filters.priority = %v (%T), want string %q", priority, priority, "high")
 		}
 	})
 
-	t.Run("team_performance's pie widget resolves description, slices, and per-slice current-user placeholders", func(t *testing.T) {
+	t.Run("sample-team-dashboard's pie widget resolves description, slices, and per-slice current-user placeholders", func(t *testing.T) {
 		h := NewDashboardHandler(&mockEntityUserClient{})
-		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/team_performance", nil), "team_performance"))
+		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-team-dashboard", nil), "sample-team-dashboard"))
 		w := httptest.NewRecorder()
 		h.GetDashboardDetail(w, r)
 
 		assertStatus(t, w, http.StatusOK)
 		body := w.Body.Bytes()
-		t.Logf("GET /dashboards/team_performance response: %s", body)
+		t.Logf("GET /dashboards/sample-team-dashboard response: %s", body)
 
 		var result dashboardDetailView
 		if err := json.Unmarshal(body, &result); err != nil {
@@ -551,15 +529,15 @@ func TestGetDashboardDetail(t *testing.T) {
 		for _, wd := range result.Widgets {
 			byID[wd.WidgetID] = wd
 		}
-		pie, ok := byID["cases_by_severity"]
+		pie, ok := byID["cases-by-severity"]
 		if !ok {
-			t.Fatalf("missing widget %q in response", "cases_by_severity")
+			t.Fatalf("missing widget %q in response", "cases-by-severity")
 		}
 		if pie.Description != "Share of active cases at each severity level." {
-			t.Errorf("cases_by_severity Description = %q, want the configured subtitle", pie.Description)
+			t.Errorf("cases-by-severity Description = %q, want the configured subtitle", pie.Description)
 		}
 		if len(pie.Slices) != 2 {
-			t.Fatalf("len(cases_by_severity.Slices) = %d, want 2", len(pie.Slices))
+			t.Fatalf("len(cases-by-severity.Slices) = %d, want 2", len(pie.Slices))
 		}
 
 		var critical, mine *dashboardPieSliceView
@@ -572,7 +550,7 @@ func TestGetDashboardDetail(t *testing.T) {
 			}
 		}
 		if critical == nil {
-			t.Fatalf("missing the %q slice in cases_by_severity.Slices", "Critical")
+			t.Fatalf("missing the %q slice in cases-by-severity.Slices", "Critical")
 		}
 		if critical.Color != "error" {
 			t.Errorf("Critical slice Color = %q, want %q", critical.Color, "error")
@@ -582,7 +560,7 @@ func TestGetDashboardDetail(t *testing.T) {
 		}
 
 		if mine == nil {
-			t.Fatalf("missing the %q slice in cases_by_severity.Slices", "Mine")
+			t.Fatalf("missing the %q slice in cases-by-severity.Slices", "Mine")
 		}
 		assigned, ok := filterValuesByField(mine.Filters, "assignedUserId")
 		if !ok || len(assigned) != 1 || assigned[0] != resolvedCurrentUserID {
@@ -601,19 +579,19 @@ func TestGetDashboardDetail(t *testing.T) {
 		var rawPie map[string]json.RawMessage
 		for _, obj := range rawWidgets {
 			var id string
-			if err := json.Unmarshal(obj["widgetId"], &id); err == nil && id == "cases_by_severity" {
+			if err := json.Unmarshal(obj["widgetId"], &id); err == nil && id == "cases-by-severity" {
 				rawPie = obj
 			}
 		}
 		if rawPie == nil {
-			t.Fatalf("cases_by_severity not found among raw widgets: %v", rawWidgets)
+			t.Fatalf("cases-by-severity not found among raw widgets: %v", rawWidgets)
 		}
-		assertJSONKeysSuperset(t, rawPie, append(append([]string(nil), dashboardWidgetJSONKeys...), "description", "slices"), "cases_by_severity")
+		assertJSONKeysSuperset(t, rawPie, append(append([]string(nil), dashboardWidgetJSONKeys...), "description", "slices"), "cases-by-severity")
 	})
 
-	t.Run("team_performance's incident_wow widget carries its configured section, unset for widgets with no section", func(t *testing.T) {
+	t.Run("sample-team-dashboard's escalated-incidents widget carries its configured section, unset for widgets with no section", func(t *testing.T) {
 		h := NewDashboardHandler(&mockEntityUserClient{})
-		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/team_performance", nil), "team_performance"))
+		r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-team-dashboard", nil), "sample-team-dashboard"))
 		w := httptest.NewRecorder()
 		h.GetDashboardDetail(w, r)
 
@@ -627,20 +605,20 @@ func TestGetDashboardDetail(t *testing.T) {
 			byID[wd.WidgetID] = wd
 		}
 
-		wow, ok := byID["incident_wow"]
+		escalated, ok := byID["escalated-incidents"]
 		if !ok {
-			t.Fatalf("missing widget %q in response", "incident_wow")
+			t.Fatalf("missing widget %q in response", "escalated-incidents")
 		}
-		if wow.Section != "SLA Violation" {
-			t.Errorf("incident_wow.Section = %q, want %q", wow.Section, "SLA Violation")
+		if escalated.Section != "Escalations" {
+			t.Errorf("escalated-incidents.Section = %q, want %q", escalated.Section, "Escalations")
 		}
 
-		teamOpenCases, ok := byID["team_open_cases"]
+		casesBySeverity, ok := byID["cases-by-severity"]
 		if !ok {
-			t.Fatalf("missing widget %q in response", "team_open_cases")
+			t.Fatalf("missing widget %q in response", "cases-by-severity")
 		}
-		if teamOpenCases.Section != "" {
-			t.Errorf("team_open_cases.Section = %q, want empty (no section configured)", teamOpenCases.Section)
+		if casesBySeverity.Section != "" {
+			t.Errorf("cases-by-severity.Section = %q, want empty (no section configured)", casesBySeverity.Section)
 		}
 	})
 
@@ -682,7 +660,7 @@ func TestResolveCurrentUserID_UsesEntityUsersMeNotJWTClaim(t *testing.T) {
 		},
 	}
 	h := NewDashboardHandler(mock)
-	r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/agents_pilot", nil), "agents_pilot"))
+	r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-dashboard", nil), "sample-dashboard"))
 	w := httptest.NewRecorder()
 	h.GetDashboardDetail(w, r)
 	assertStatus(t, w, http.StatusOK)
@@ -696,12 +674,12 @@ func TestResolveCurrentUserID_UsesEntityUsersMeNotJWTClaim(t *testing.T) {
 		byID[wd.WidgetID] = wd
 	}
 
-	assigned, ok := filterValuesByField(byID["my_patches"].Filters, "assignedUserId")
+	assigned, ok := filterValuesByField(byID["my-open-cases"].Filters, "assignedUserId")
 	if !ok || len(assigned) != 1 {
-		t.Fatalf("my_patches assignedUserId values = %v, want a 1-element array", assigned)
+		t.Fatalf("my-open-cases assignedUserId values = %v, want a 1-element array", assigned)
 	}
 	if assigned[0] != entityResolvedID {
-		t.Errorf("my_patches assignedUserId values[0] = %v, want the entity-resolved id %q (not the JWT claim %q)",
+		t.Errorf("my-open-cases assignedUserId values[0] = %v, want the entity-resolved id %q (not the JWT claim %q)",
 			assigned[0], entityResolvedID, testUser.UserID)
 	}
 }
@@ -717,7 +695,7 @@ func TestResolveCurrentUserID_FallsBackToJWTClaimOnEntityError(t *testing.T) {
 		},
 	}
 	h := NewDashboardHandler(mock)
-	r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/agents_pilot", nil), "agents_pilot"))
+	r := withUser(withDashboardID(httptest.NewRequest(http.MethodGet, "/dashboards/sample-dashboard", nil), "sample-dashboard"))
 	w := httptest.NewRecorder()
 	h.GetDashboardDetail(w, r)
 	assertStatus(t, w, http.StatusOK)
@@ -730,8 +708,8 @@ func TestResolveCurrentUserID_FallsBackToJWTClaimOnEntityError(t *testing.T) {
 	for _, wd := range result.Widgets {
 		byID[wd.WidgetID] = wd
 	}
-	assigned, ok := filterValuesByField(byID["my_patches"].Filters, "assignedUserId")
+	assigned, ok := filterValuesByField(byID["my-open-cases"].Filters, "assignedUserId")
 	if !ok || len(assigned) != 1 || assigned[0] != testUser.UserID {
-		t.Errorf("my_patches assignedUserId values = %v, want the JWT-claim fallback [%q]", assigned, testUser.UserID)
+		t.Errorf("my-open-cases assignedUserId values = %v, want the JWT-claim fallback [%q]", assigned, testUser.UserID)
 	}
 }
diff --git a/apps/csm-portal/backend/openapi.yaml b/apps/csm-portal/backend/openapi.yaml
index 3b6b1ce833..1743478b33 100644
--- a/apps/csm-portal/backend/openapi.yaml
+++ b/apps/csm-portal/backend/openapi.yaml
@@ -1677,7 +1677,7 @@ paths:
       parameters:
         - name: dashboardId
           in: path
-          description: ID of the dashboard (e.g. "agents_pilot")
+          description: ID of the dashboard (e.g. "sample-dashboard")
           required: true
           schema:
             type: string
diff --git a/apps/csm-portal/webapp/src/features/csm-cases/components/CasesList.tsx b/apps/csm-portal/webapp/src/features/csm-cases/components/CasesList.tsx
index ead2051e9e..1642d5805e 100644
--- a/apps/csm-portal/webapp/src/features/csm-cases/components/CasesList.tsx
+++ b/apps/csm-portal/webapp/src/features/csm-cases/components/CasesList.tsx
@@ -326,7 +326,6 @@ export default function CasesList({
                 )}
               </Box>
               <Typography variant="caption" color="text.secondary" noWrap>
-                {c.updatedAtIsCreatedFallback && "Created "}
                 <RelativeTime iso={c.updatedAt} />
               </Typography>
             </Box>
diff --git a/apps/csm-portal/webapp/src/features/csm-cases/types/csmCases.ts b/apps/csm-portal/webapp/src/features/csm-cases/types/csmCases.ts
index 43728afbbc..beee91935f 100644
--- a/apps/csm-portal/webapp/src/features/csm-cases/types/csmCases.ts
+++ b/apps/csm-portal/webapp/src/features/csm-cases/types/csmCases.ts
@@ -82,11 +82,9 @@ export interface CsmCaseRow {
    */
   hasSla?: boolean;
   createdAt: string;
+  /** Falls back to {@link createdAt} when the backend hasn't returned
+   * `updatedOn` for this row; rendered unprefixed either way. */
   updatedAt: string;
-  /** True when the backend didn't return `updatedOn` and {@link updatedAt}
-   * was filled in from {@link createdAt} instead — the list renders that
-   * fallback labeled "Created", never silently as "Updated". */
-  updatedAtIsCreatedFallback?: boolean;
 }
 
 export interface CsmCasesListResponse {
diff --git a/apps/csm-portal/webapp/src/features/csm-cases/utils/caseSearchPayload.ts b/apps/csm-portal/webapp/src/features/csm-cases/utils/caseSearchPayload.ts
index 3d82da88c7..5e7c22c838 100644
--- a/apps/csm-portal/webapp/src/features/csm-cases/utils/caseSearchPayload.ts
+++ b/apps/csm-portal/webapp/src/features/csm-cases/utils/caseSearchPayload.ts
@@ -185,6 +185,5 @@ export function mapCaseSearchViewToRow(
     hasSla: false,
     createdAt: c.createdOn ?? "",
     updatedAt: c.updatedOn ?? c.createdOn ?? "",
-    updatedAtIsCreatedFallback: !c.updatedOn && !!c.createdOn,
   };
 }
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/api/useGetMyAssignedOpenCases.ts b/apps/csm-portal/webapp/src/features/csm-dashboard/api/useGetMyAssignedOpenCases.ts
index 027cd25e78..75e789fcac 100644
--- a/apps/csm-portal/webapp/src/features/csm-dashboard/api/useGetMyAssignedOpenCases.ts
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/api/useGetMyAssignedOpenCases.ts
@@ -155,7 +155,6 @@ export function useGetMyAssignedOpenCases(
           hasSla: false,
           createdAt: c.createdOn ?? "",
           updatedAt: c.updatedOn ?? c.createdOn ?? "",
-          updatedAtIsCreatedFallback: !c.updatedOn && !!c.createdOn,
         };
       });
 
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.test.tsx b/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.test.tsx
index 02de5f8678..e6804caf34 100644
--- a/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.test.tsx
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.test.tsx
@@ -53,6 +53,8 @@ describe("AbtDashboardHeader", () => {
         dashboardKey="agents_pilot"
         onDashboardChange={vi.fn()}
         dashboardList={DASHBOARD_LIST}
+        selectedTeamId={undefined}
+        onTeamChange={vi.fn()}
       />,
     );
 
@@ -74,6 +76,8 @@ describe("AbtDashboardHeader", () => {
         dashboardKey="team_performance"
         onDashboardChange={vi.fn()}
         dashboardList={DASHBOARD_LIST}
+        selectedTeamId={undefined}
+        onTeamChange={vi.fn()}
       />,
     );
 
@@ -92,4 +96,28 @@ describe("AbtDashboardHeader", () => {
     expect(within(listbox).getByText("CS Operations")).toBeInTheDocument();
     expect(within(listbox).getByText("All teams")).toBeInTheDocument();
   });
+
+  it("calls onTeamChange when a team is picked", async () => {
+    postMock.mockResolvedValue({
+      teams: [{ id: "cs_team_leads", name: "CS Team Leads" }],
+    });
+    const onTeamChange = vi.fn();
+
+    renderWithClient(
+      <AbtDashboardHeader
+        dashboardKey="team_performance"
+        onDashboardChange={vi.fn()}
+        dashboardList={DASHBOARD_LIST}
+        selectedTeamId={undefined}
+        onTeamChange={onTeamChange}
+      />,
+    );
+
+    const [teamSelect] = screen.getAllByRole("combobox");
+    fireEvent.mouseDown(teamSelect);
+    const listbox = await screen.findByRole("listbox");
+    fireEvent.click(await within(listbox).findByText("CS Team Leads"));
+
+    expect(onTeamChange).toHaveBeenCalledWith("cs_team_leads");
+  });
 });
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.tsx b/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.tsx
index f7ebed01cd..6e949b9eea 100644
--- a/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.tsx
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/components/AbtDashboardHeader.tsx
@@ -15,7 +15,7 @@
 // under the License.
 
 import { Box, FormControl, MenuItem, Select, Typography } from "@wso2/oxygen-ui";
-import { useState, type JSX } from "react";
+import { type JSX } from "react";
 import type { BeDashboardListItem } from "@api/backend/types";
 import type { DashboardKey } from "@features/csm-dashboard/types/abtDashboard";
 import { useTeams } from "@features/csm-dashboard/api/useTeams";
@@ -25,29 +25,37 @@ interface AbtDashboardHeaderProps {
   onDashboardChange: (key: DashboardKey) => void;
   /** Every dashboard in the BE registry (GET /dashboards), for the switcher. */
   dashboardList: BeDashboardListItem[];
+  /** The currently selected team, controlled by the parent (URL-synced) —
+   * `undefined` when no team is selected, or when the current dashboard
+   * isn't `isTeamBased` (the parent never passes a stale team id through in
+   * that case). */
+  selectedTeamId: string | undefined;
+  onTeamChange: (teamId: string | undefined) => void;
 }
 
 /**
  * Dashboard header: title, the dashboard switcher, and (for a dashboard
  * flagged `isTeamBased`) a team selector sourced from `POST /teams/search`.
- * Team selection is UI state only today — it does not yet scope any
- * widget's data (see `Dashboard.isTeamBased` on the backend); wiring a
- * selected team into widget filters is a later increment. The earlier My
- * ABT / All customers toggle was removed entirely — ABT scoping was never
- * implemented and dashboards carry no other special behavior beyond which
- * one (and, for team-based ones, which team) is selected.
+ * Both the selected dashboard and the selected team are owned by the parent
+ * (`CsmDashboardPage`), which keeps them in sync with the URL so a specific
+ * dashboard/team view is shareable. Team selection is UI state only today —
+ * it does not yet scope any widget's data (see `Dashboard.isTeamBased` on
+ * the backend); wiring a selected team into widget filters is a later
+ * increment. The earlier My ABT / All customers toggle was removed
+ * entirely — ABT scoping was never implemented and dashboards carry no
+ * other special behavior beyond which one (and, for team-based ones, which
+ * team) is selected.
  */
 export default function AbtDashboardHeader({
   dashboardKey,
   onDashboardChange,
   dashboardList,
+  selectedTeamId,
+  onTeamChange,
 }: AbtDashboardHeaderProps): JSX.Element {
   const currentOption = dashboardList.find((o) => o.id === dashboardKey);
   const isTeamBased = currentOption?.isTeamBased ?? false;
 
-  const [selectedTeamId, setSelectedTeamId] = useState<string | undefined>(
-    undefined,
-  );
   const teams = useTeams(isTeamBased);
 
   return (
@@ -71,7 +79,7 @@ export default function AbtDashboardHeader({
           <FormControl size="small" sx={{ minWidth: 180 }}>
             <Select
               value={selectedTeamId ?? ""}
-              onChange={(e) => setSelectedTeamId(e.target.value || undefined)}
+              onChange={(e) => onTeamChange(e.target.value || undefined)}
               displayEmpty
               aria-label="Select team"
             >
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/components/DashboardWidgetTile.tsx b/apps/csm-portal/webapp/src/features/csm-dashboard/components/DashboardWidgetTile.tsx
index 54041b8eb4..191f5d34a7 100644
--- a/apps/csm-portal/webapp/src/features/csm-dashboard/components/DashboardWidgetTile.tsx
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/components/DashboardWidgetTile.tsx
@@ -271,10 +271,20 @@ export default function DashboardWidgetTile({
           <Icon size={16} />
         </Box>
         <Box sx={{ minWidth: 0, flex: 1 }}>
-          <Typography variant="caption" color="text.secondary">
+          <Typography variant="caption" color="text.secondary" noWrap>
             {displayName}
           </Typography>
-          <Typography variant="h5" sx={{ mt: 0.5 }}>
+          <Typography
+            noWrap
+            sx={{
+              mt: 0.5,
+              lineHeight: 1.1,
+              fontWeight: 700,
+              fontSize: "3.25rem",
+              overflow: "hidden",
+              textOverflow: "ellipsis",
+            }}
+          >
             {data?.total ?? 0}
           </Typography>
         </Box>
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/config/widgetResourceConfig.test.ts b/apps/csm-portal/webapp/src/features/csm-dashboard/config/widgetResourceConfig.test.ts
new file mode 100644
index 0000000000..0aa4a2477b
--- /dev/null
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/config/widgetResourceConfig.test.ts
@@ -0,0 +1,70 @@
+// Copyright (c) 2026 WSO2 LLC. (https://www.wso2.com).
+//
+// WSO2 LLC. licenses this file to you under the Apache License,
+// Version 2.0 (the "License"); you may not use this file except
+// in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+/**
+ * Regression coverage for the empty-array filter guard: a DSL entry with
+ * `values: []` must leave the corresponding `CasesFilters` field unset
+ * rather than setting an explicit empty filter (which the cases list would
+ * treat as "match nothing" instead of "no constraint") — see the
+ * CodeRabbit finding this closes.
+ */
+
+import { describe, expect, it } from "vitest";
+import { WIDGET_RESOURCE_CONFIG } from "@features/csm-dashboard/config/widgetResourceConfig";
+
+function hrefParams(href: string): URLSearchParams {
+  const [, qs] = href.split("?");
+  return new URLSearchParams(qs ?? "");
+}
+
+describe("WIDGET_RESOURCE_CONFIG.case.buildHref", () => {
+  it("omits states/severities/types/products from the href when the DSL entry's values are empty", () => {
+    const href = WIDGET_RESOURCE_CONFIG.case.buildHref({
+      filters: [
+        { field: "state", op: "in", values: [] },
+        { field: "severity", op: "in", values: [] },
+        { field: "type", op: "in", values: [] },
+        { field: "product", op: "in", values: [] },
+      ],
+    });
+
+    const params = hrefParams(href);
+    expect(params.has("states")).toBe(false);
+    expect(params.has("severities")).toBe(false);
+    expect(params.has("types")).toBe(false);
+    expect(params.has("products")).toBe(false);
+  });
+
+  it("still sets each field when the DSL entry carries real values", () => {
+    const href = WIDGET_RESOURCE_CONFIG.case.buildHref({
+      filters: [
+        { field: "state", op: "in", values: ["open"] },
+        { field: "severity", op: "in", values: ["critical"] },
+        { field: "type", op: "in", values: ["case"] },
+        { field: "product", op: "in", values: ["API Manager"] },
+      ],
+    });
+
+    const params = hrefParams(href);
+    expect(params.get("states")).toBe("open");
+    expect(params.get("types")).toBe("case");
+    expect(params.get("products")).toBe("API Manager");
+    // Severity is remapped from the dashboard label to the case-list's own
+    // S-code, so just assert it was set at all (severity-mapping specifics
+    // aren't this fix's concern).
+    expect(params.has("severities")).toBe(true);
+  });
+});
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/config/widgetResourceConfig.ts b/apps/csm-portal/webapp/src/features/csm-dashboard/config/widgetResourceConfig.ts
index 63629fa15a..92f47d4679 100644
--- a/apps/csm-portal/webapp/src/features/csm-dashboard/config/widgetResourceConfig.ts
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/config/widgetResourceConfig.ts
@@ -157,17 +157,17 @@ function translateCaseDashboardFilters(
   const fieldFilters = asCaseFieldFilters(filters.filters);
 
   const states = caseFilterValues(fieldFilters, "state");
-  if (states) out.states = states as CasesFilters["states"];
+  if (states && states.length > 0) out.states = states as CasesFilters["states"];
   const severities = caseFilterValues(fieldFilters, "severity");
-  if (severities) {
+  if (severities && severities.length > 0) {
     out.severities = severities
       .map((s) => DASHBOARD_SEVERITY_TO_S_CODE[s])
       .filter((s): s is Severity => Boolean(s));
   }
   const types = caseFilterValues(fieldFilters, "type");
-  if (types) out.caseTypes = types as CasesFilters["caseTypes"];
+  if (types && types.length > 0) out.caseTypes = types as CasesFilters["caseTypes"];
   const productNames = caseFilterValues(fieldFilters, "product");
-  if (productNames) out.productNames = productNames;
+  if (productNames && productNames.length > 0) out.productNames = productNames;
   const assignedUserIds = caseFilterValues(fieldFilters, "assignedUserId");
   if (assignedUserIds && assignedUserIds.length > 0) out.assignees = ["@me"];
   return out;
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.test.tsx b/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.test.tsx
index 80a201975f..18caacf6c5 100644
--- a/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.test.tsx
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.test.tsx
@@ -15,11 +15,34 @@
 // under the License.
 
 import { fireEvent, render, screen, within } from "@testing-library/react";
+import { MemoryRouter, useLocation } from "react-router";
 import { describe, expect, it, vi, beforeEach } from "vitest";
 import "@testing-library/jest-dom/vitest";
+import type { JSX } from "react";
 import CsmDashboardPage from "@features/csm-dashboard/pages/CsmDashboardPage";
 import { useDashboardList } from "@features/csm-dashboard/api/useDashboardList";
 
+/** Surfaces the router's current `location.search` for assertions — the
+ * `MemoryRouter`'s history is in-memory, not reflected on `window.location`,
+ * so this reads it via `useLocation` instead. */
+function LocationDisplay(): JSX.Element {
+  const location = useLocation();
+  return <div data-testid="location-search">{location.search}</div>;
+}
+
+function renderAt(initialEntry: string): ReturnType<typeof render> {
+  return render(
+    <MemoryRouter initialEntries={[initialEntry]}>
+      <CsmDashboardPage />
+      <LocationDisplay />
+    </MemoryRouter>,
+  );
+}
+
+function currentSearch(): string {
+  return screen.getByTestId("location-search").textContent ?? "";
+}
+
 vi.mock("@features/csm-dashboard/api/useDashboardList", () => ({
   useDashboardList: vi.fn(),
 }));
@@ -68,7 +91,7 @@ describe("CsmDashboardPage", () => {
   it("shows a loading skeleton before the dashboard list resolves", () => {
     mockListResult({ data: undefined, isLoading: true });
 
-    const { container } = render(<CsmDashboardPage />);
+    const { container } = renderAt("/");
 
     expect(container.querySelectorAll(".MuiSkeleton-root").length).toBeGreaterThan(0);
     expect(screen.queryByTestId("agents-landing-pilot")).not.toBeInTheDocument();
@@ -77,7 +100,7 @@ describe("CsmDashboardPage", () => {
   it("selects the isDefault dashboard once the list loads and renders the enabled, populated switcher", () => {
     mockListResult({ data: DASHBOARD_LIST, isLoading: false });
 
-    render(<CsmDashboardPage />);
+    renderAt("/");
 
     // The isDefault entry ("agents_pilot") is selected on load.
     expect(screen.getByTestId("agents-landing-pilot")).toHaveTextContent(
@@ -108,7 +131,7 @@ describe("CsmDashboardPage", () => {
       isLoading: false,
     });
 
-    render(<CsmDashboardPage />);
+    renderAt("/");
 
     expect(screen.getByTestId("agents-landing-pilot")).toHaveTextContent(
       "operations",
@@ -118,7 +141,7 @@ describe("CsmDashboardPage", () => {
   it("switches to another dashboard when picked from the switcher", () => {
     mockListResult({ data: DASHBOARD_LIST, isLoading: false });
 
-    render(<CsmDashboardPage />);
+    renderAt("/");
 
     expect(screen.getByTestId("agents-landing-pilot")).toHaveTextContent(
       "agents_pilot",
@@ -136,11 +159,62 @@ describe("CsmDashboardPage", () => {
   it("shows an error state rather than an infinite skeleton when the list fails to load", () => {
     mockListResult({ data: undefined, isLoading: false, isError: true });
 
-    render(<CsmDashboardPage />);
+    renderAt("/");
 
     expect(
       screen.getByText("Could not load the dashboard list."),
     ).toBeInTheDocument();
     expect(screen.queryByTestId("agents-landing-pilot")).not.toBeInTheDocument();
   });
+
+  it("selects the dashboard named by the URL's `dashboard` param, not the BE default", () => {
+    mockListResult({ data: DASHBOARD_LIST, isLoading: false });
+
+    renderAt("/dashboard?dashboard=iam");
+
+    expect(screen.getByTestId("agents-landing-pilot")).toHaveTextContent("iam");
+  });
+
+  it("falls back to the BE default when the URL names a dashboard id that isn't in the list", () => {
+    mockListResult({ data: DASHBOARD_LIST, isLoading: false });
+
+    renderAt("/dashboard?dashboard=does-not-exist");
+
+    expect(screen.getByTestId("agents-landing-pilot")).toHaveTextContent(
+      "agents_pilot",
+    );
+  });
+
+  it("writes the `dashboard` param to the URL (via replace) when the switcher is used", () => {
+    mockListResult({ data: DASHBOARD_LIST, isLoading: false });
+
+    renderAt("/dashboard");
+
+    const select = screen.getByRole("combobox");
+    fireEvent.mouseDown(select);
+    fireEvent.click(within(screen.getByRole("listbox")).getByText("Operations"));
+
+    expect(currentSearch()).toBe("?dashboard=operations");
+  });
+
+  it("clears a stale `team` param from the URL when switching to a non-team-based dashboard", () => {
+    mockListResult({
+      data: [
+        ...DASHBOARD_LIST,
+        { id: "team_performance", displayName: "Team performance", isDefault: false, isTeamBased: true },
+      ],
+      isLoading: false,
+    });
+
+    renderAt("/dashboard?dashboard=team_performance&team=cs_team_leads");
+
+    // Two comboboxes render for a team-based dashboard (team + dashboard);
+    // the dashboard switcher is always the second.
+    const selects = screen.getAllByRole("combobox");
+    const select = selects[selects.length - 1];
+    fireEvent.mouseDown(select);
+    fireEvent.click(within(screen.getByRole("listbox")).getByText("Operations"));
+
+    expect(currentSearch()).toBe("?dashboard=operations");
+  });
 });
diff --git a/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.tsx b/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.tsx
index 38f25f10e5..dcb7a14f2d 100644
--- a/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.tsx
+++ b/apps/csm-portal/webapp/src/features/csm-dashboard/pages/CsmDashboardPage.tsx
@@ -15,33 +15,78 @@
 // under the License.
 
 import { Box, Skeleton, Typography } from "@wso2/oxygen-ui";
-import { useState, type JSX } from "react";
+import { useCallback, useMemo, type JSX } from "react";
+import { useSearchParams } from "react-router";
 import AbtDashboardHeader from "@features/csm-dashboard/components/AbtDashboardHeader";
 import AgentsLandingPagePilot from "@features/csm-dashboard/components/AgentsLandingPagePilot";
 import { useDashboardList } from "@features/csm-dashboard/api/useDashboardList";
 import type { DashboardKey } from "@features/csm-dashboard/types/abtDashboard";
 
+/** Query param holding the selected dashboard id — kept in the URL so a
+ * link to a specific dashboard (and, for team-based ones, a specific team;
+ * see `TEAM_PARAM`) is shareable/bookmarkable/refresh-safe, matching the
+ * convention in `casesFiltersUrl.ts`. */
+const DASHBOARD_PARAM = "dashboard";
+/** Query param holding the selected team id, only meaningful (and only
+ * ever set) while the current dashboard is `isTeamBased`. */
+const TEAM_PARAM = "team";
+
 /**
  * Top-level CSM dashboard. The dashboard list and the default selection are
  * BE-driven: `GET /dashboards` populates the switcher in the header, and the
- * `isDefault` entry is selected on load. Dashboards are selected purely by
- * dropdown — there is no other per-dashboard scoping control. Every
- * dashboard in the registry has at least one real (config-driven) widget,
- * so this always renders the real widget grid.
+ * `isDefault` entry is selected on load unless the URL already names a
+ * (valid) dashboard. Dashboards are selected purely by dropdown — there is
+ * no other per-dashboard scoping control. Every dashboard in the registry
+ * has at least one real (config-driven) widget, so this always renders the
+ * real widget grid.
  */
 export default function CsmDashboardPage(): JSX.Element {
-  // Undefined until the switcher is used; until then the selection derives
-  // from the loaded list's isDefault entry (see `dashboardKey` below), so
-  // there is nothing to synchronize via an effect.
-  const [manualDashboardKey, setManualDashboardKey] = useState<
-    DashboardKey | undefined
-  >(undefined);
+  const [searchParams, setSearchParams] = useSearchParams();
 
   const dashboardList = useDashboardList();
   const list = dashboardList.data;
   const defaultEntry =
     list && list.length > 0 ? (list.find((d) => d.isDefault) ?? list[0]) : undefined;
-  const dashboardKey = manualDashboardKey ?? defaultEntry?.id;
+
+  const urlDashboardKey = searchParams.get(DASHBOARD_PARAM) as DashboardKey | null;
+  const urlEntry = list?.find((d) => d.id === urlDashboardKey);
+  // Fall back to the BE default whenever the URL doesn't name a dashboard,
+  // or names one that isn't in the loaded list (stale/hand-edited link) —
+  // never crash on an unknown id.
+  const dashboardKey = urlEntry ? urlEntry.id : defaultEntry?.id;
+  const currentEntry = urlEntry ?? defaultEntry;
+
+  const rawTeamId = searchParams.get(TEAM_PARAM) ?? undefined;
+  // Only apply a `team` param when the CURRENT dashboard is team-based — a
+  // stale param left over from a previously selected team-based dashboard
+  // must not leak into a non-team-based one.
+  const selectedTeamId = currentEntry?.isTeamBased ? rawTeamId : undefined;
+
+  const handleDashboardChange = useCallback(
+    (key: DashboardKey) => {
+      const next = new URLSearchParams(searchParams);
+      next.set(DASHBOARD_PARAM, key);
+      const nextEntry = list?.find((d) => d.id === key);
+      // Switching to a dashboard that isn't team-based: clear any stale
+      // `team` param rather than leaving an inapplicable one sitting in
+      // the URL.
+      if (!nextEntry?.isTeamBased) next.delete(TEAM_PARAM);
+      setSearchParams(next, { replace: true });
+    },
+    [searchParams, setSearchParams, list],
+  );
+
+  const handleTeamChange = useCallback(
+    (teamId: string | undefined) => {
+      const next = new URLSearchParams(searchParams);
+      if (teamId) next.set(TEAM_PARAM, teamId);
+      else next.delete(TEAM_PARAM);
+      setSearchParams(next, { replace: true });
+    },
+    [searchParams, setSearchParams],
+  );
+
+  const dashboardListData = useMemo(() => dashboardList.data ?? [], [dashboardList.data]);
 
   if (dashboardList.isError) {
     return (
@@ -67,8 +112,10 @@ export default function CsmDashboardPage(): JSX.Element {
     <Box sx={{ display: "flex", flexDirection: "column", gap: 3 }}>
       <AbtDashboardHeader
         dashboardKey={dashboardKey}
-        onDashboardChange={setManualDashboardKey}
-        dashboardList={dashboardList.data ?? []}
+        onDashboardChange={handleDashboardChange}
+        dashboardList={dashboardListData}
+        selectedTeamId={selectedTeamId}
+        onTeamChange={handleTeamChange}
       />
       <AgentsLandingPagePilot dashboardId={dashboardKey} />
     </Box>
diff --git a/entity-service/internal/domain/entity.go b/entity-service/internal/domain/entity.go
index 55a193819b..5bd3f5ee27 100644
--- a/entity-service/internal/domain/entity.go
+++ b/entity-service/internal/domain/entity.go
@@ -1437,6 +1437,7 @@ type SearchCaseView struct {
 	InternalID string `json:"internalId"`
 	Number     string `json:"number"`
 	CreatedOn  string `json:"createdOn"`
+	UpdatedOn  string `json:"updatedOn"`
 	CreatedBy  string `json:"createdBy"`
 	// CreatedByUser is the canonical user reference for the case creator, a
 	// sibling of createdBy. Its id is populated only where the backing data
diff --git a/entity-service/internal/repository/case_repo.go b/entity-service/internal/repository/case_repo.go
index 1b0cabd810..d59af7b015 100644
--- a/entity-service/internal/repository/case_repo.go
+++ b/entity-service/internal/repository/case_repo.go
@@ -483,7 +483,7 @@ func (r *caseRepo) SearchCases(ctx context.Context, req domain.SearchCasesReques
 	dataQuery := fmt.Sprintf(
 		`SELECT c.id, c.number, c.internal_id,
 		        c.type, c.subject, c.description, c.severity, c.issue_type, c.state,
-		        c.engagement_type, c.work_state, c.created_at,
+		        c.engagement_type, c.work_state, c.created_at, c.updated_at,
 		        u.email,
 		        p.id, p.name,
 		        d.id, d.name,
@@ -523,7 +523,7 @@ func (r *caseRepo) SearchCases(ctx context.Context, req domain.SearchCasesReques
 			var cv domain.SearchCaseView
 			var caseType, subject, description string
 			var severity, issueType, engagementType, workState *string
-			var createdAt time.Time
+			var createdAt, updatedAt time.Time
 			var aeID, aeName *string
 			var pcID, pcNumber *string
 			var rcID, rcNumber *string
@@ -533,7 +533,7 @@ func (r *caseRepo) SearchCases(ctx context.Context, req domain.SearchCasesReques
 			if err := rows.Scan(
 				&cv.ID, &cv.Number, &cv.InternalID,
 				&caseType, &subject, &description, &severity, &issueType, &cv.State,
-				&engagementType, &workState, &createdAt,
+				&engagementType, &workState, &createdAt, &updatedAt,
 				&cv.CreatedBy,
 				&cv.Project.ID, &cv.Project.Name,
 				&depID, &depName,
@@ -555,6 +555,7 @@ func (r *caseRepo) SearchCases(ctx context.Context, req domain.SearchCasesReques
 			cv.EngagementType = engagementType
 			cv.WorkState = workState
 			cv.CreatedOn = createdAt.UTC().Format(time.RFC3339)
+			cv.UpdatedOn = updatedAt.UTC().Format(time.RFC3339)
 			cv.Product = &domain.EntityRef{ID: prodID, Name: prodName}
 			// The search projection carries only the creator's email, no id or
 			// display name, so the canonical reference keeps a null id.
diff --git a/entity-service/internal/service/case_filters.go b/entity-service/internal/service/case_filters.go
index 112d518e74..9aa8844c8e 100644
--- a/entity-service/internal/service/case_filters.go
+++ b/entity-service/internal/service/case_filters.go
@@ -73,6 +73,10 @@ func parseCaseFilterDate(f domain.CaseFieldFilter, value string) (*time.Time, er
 		return &t, nil
 	}
 	if t, err := time.Parse("2006-01-02", value); err == nil {
+		// A date-only lte bound means "on or before that whole day".
+		if f.Op == "lte" {
+			t = t.AddDate(0, 0, 1).Add(-time.Nanosecond)
+		}
 		return &t, nil
 	}
 	return nil, &apierror.ValidationError{Msg: fmt.Sprintf("filters: field %q op %q value %q must be an RFC3339 timestamp or YYYY-MM-DD date", f.Field, f.Op, value)}
diff --git a/entity-service/internal/service/case_filters_test.go b/entity-service/internal/service/case_filters_test.go
index fc36e288f0..da2b92a0f4 100644
--- a/entity-service/internal/service/case_filters_test.go
+++ b/entity-service/internal/service/case_filters_test.go
@@ -20,6 +20,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"testing"
+	"time"
 
 	"github.com/wso2-open-operations/cs-tools/entity-service/internal/apierror"
 	"github.com/wso2-open-operations/cs-tools/entity-service/internal/domain"
@@ -187,6 +188,30 @@ func TestParseCaseFieldFilters_Rejections(t *testing.T) {
 	}
 }
 
+func TestParseCaseFieldFilters_DateOnlyLteBoundIncludesWholeDay(t *testing.T) {
+	filters := []domain.CaseFieldFilter{
+		{Field: "createdOn", Op: "lte", Values: []string{"2026-01-31"}},
+	}
+
+	p, err := ParseCaseFieldFilters(filters, "caller@example.com", nil)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if p.EndCreatedDate == nil {
+		t.Fatalf("expected EndCreatedDate to be set")
+	}
+
+	endOfDay := time.Date(2026, 1, 31, 23, 59, 59, 999999999, time.UTC)
+	if !p.EndCreatedDate.Equal(endOfDay) {
+		t.Fatalf("expected EndCreatedDate %v to equal the exact inclusive boundary %v", p.EndCreatedDate, endOfDay)
+	}
+
+	startOfNextDay := time.Date(2026, 2, 1, 0, 0, 0, 0, time.UTC)
+	if !p.EndCreatedDate.Before(startOfNextDay) {
+		t.Fatalf("expected EndCreatedDate %v to exclude 00:00:00 of the next day", p.EndCreatedDate)
+	}
+}
+
 func TestParseCaseFieldFilters_CreatedByCurrentUser_RequiresCallerEmail(t *testing.T) {
 	filters := []domain.CaseFieldFilter{{Field: "createdBy", Op: "eq", Values: []string{currentUserFilterPlaceholder}}}
 
diff --git a/entity-service/internal/service/case_service.go b/entity-service/internal/service/case_service.go
index 0df8560c3f..75625dce50 100644
--- a/entity-service/internal/service/case_service.go
+++ b/entity-service/internal/service/case_service.go
@@ -425,6 +425,38 @@ func (s *caseService) SearchCases(ctx context.Context, req domain.SearchCasesReq
 		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: "updatedOn: lte value must not be before gte value"}
 	}
 
+	// These fields dot-walk into ServiceNow-specific concepts (tags,
+	// project-onboarding-status, integration-CS-team, etc.) that have no
+	// equivalent in the Postgres schema and no repository query support today.
+	// Reject rather than silently drop the predicate and widen the result set.
+	if len(parsed.Tags) > 0 {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "tag" is not supported by this data source`}
+	}
+	if len(parsed.ExcludeTags) > 0 {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "tag" (notIn) is not supported by this data source`}
+	}
+	if parsed.ParentID != nil {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "parentId" is not supported by this data source`}
+	}
+	if len(parsed.ProductNames) > 0 {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "product" is not supported by this data source`}
+	}
+	if len(parsed.ProjectOnboardingStatuses) > 0 {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "projectOnboardingStatus" is not supported by this data source`}
+	}
+	if len(parsed.ProjectTypeIDs) > 0 {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "projectType" is not supported by this data source`}
+	}
+	if len(parsed.IntegrationCsTeamIDs) > 0 {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "integrationCsTeam" is not supported by this data source`}
+	}
+	if parsed.Unassigned {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "assignedUserId" (isEmpty) is not supported by this data source`}
+	}
+	if parsed.ResolutionNotesEmpty {
+		return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: `field "resolutionNotes" is not supported by this data source`}
+	}
+
 	req.Parsed = parsed
 
 	if req.SortBy.Field == "" {
diff --git a/entity-service/internal/service/case_service_test.go b/entity-service/internal/service/case_service_test.go
new file mode 100644
index 0000000000..d51c7bb64f
--- /dev/null
+++ b/entity-service/internal/service/case_service_test.go
@@ -0,0 +1,154 @@
+// Copyright (c) 2026 WSO2 LLC. (https://www.wso2.com).
+//
+// WSO2 LLC. licenses this file to you under the Apache License,
+// Version 2.0 (the "License"); you may not use this file except
+// in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package service
+
+import (
+	"context"
+	"testing"
+
+	"github.com/wso2-open-operations/cs-tools/entity-service/internal/apierror"
+	"github.com/wso2-open-operations/cs-tools/entity-service/internal/domain"
+)
+
+// stubCaseRepo is a minimal repository.CaseRepository whose SearchCases
+// panics if called: tests using it prove ParseCaseFieldFilters' rejection of
+// an unsupported field happens before the Postgres backend ever reaches the
+// repository, not merely that the repository ignores the field.
+type stubCaseRepo struct {
+	searchCases func(ctx context.Context, req domain.SearchCasesRequest) ([]domain.SearchCaseView, int, error)
+}
+
+func (s *stubCaseRepo) CreateCase(context.Context, domain.CreateCaseRequest) (domain.Case, error) {
+	panic("not implemented")
+}
+func (s *stubCaseRepo) GetCaseByID(context.Context, string) (domain.CaseView, error) {
+	panic("not implemented")
+}
+func (s *stubCaseRepo) SearchCases(ctx context.Context, req domain.SearchCasesRequest) ([]domain.SearchCaseView, int, error) {
+	if s.searchCases != nil {
+		return s.searchCases(ctx, req)
+	}
+	panic("SearchCases called unexpectedly: the unsupported-field check should have short-circuited before reaching the repository")
+}
+func (s *stubCaseRepo) CreateCaseComment(context.Context, domain.CreateCaseCommentRequest) (domain.CaseComment, error) {
+	panic("not implemented")
+}
+func (s *stubCaseRepo) SearchCaseComments(context.Context, domain.SearchCaseCommentsRequest) ([]domain.CaseComment, int, error) {
+	panic("not implemented")
+}
+func (s *stubCaseRepo) UpdateCase(context.Context, domain.UpdateCaseRequest) (domain.Case, error) {
+	panic("not implemented")
+}
+
+// stubUserRepo is a minimal repository.UserRepository; SearchCases doesn't
+// exercise it beyond the createdBy-current-user path, which these tests don't
+// use.
+type stubUserRepo struct{}
+
+func (stubUserRepo) SearchUsers(context.Context, domain.SearchUsersRequest) ([]domain.User, int, error) {
+	panic("not implemented")
+}
+func (stubUserRepo) GetUserByEmail(context.Context, string) (domain.User, error) {
+	panic("not implemented")
+}
+
+// TestCaseService_SearchCases_RejectsUnsupportedPostgresFields proves the
+// Postgres-backed SearchCases path rejects each of the 9 filter fields
+// ParseCaseFieldFilters accepts but the Postgres repository has no query
+// support for (they dot-walk into SN-specific concepts with no Postgres
+// schema equivalent), rather than silently accepting the request and
+// returning a broader-than-requested result set.
+func TestCaseService_SearchCases_RejectsUnsupportedPostgresFields(t *testing.T) {
+	svc := NewCaseService(&stubCaseRepo{}, stubUserRepo{})
+	ctx := contextWithUserIDToken(fakeJWTWithEmail(t, "jane.doe@example.com"))
+
+	cases := []struct {
+		name   string
+		filter domain.CaseFieldFilter
+	}{
+		{name: "tag in", filter: domain.CaseFieldFilter{Field: "tag", Op: "in", Values: []string{"beta"}}},
+		{name: "tag notIn", filter: domain.CaseFieldFilter{Field: "tag", Op: "notIn", Values: []string{"beta"}}},
+		{name: "parentId", filter: domain.CaseFieldFilter{Field: "parentId", Op: "eq", Values: []string{"00000000-0000-0000-0000-000000000000"}}},
+		{name: "product", filter: domain.CaseFieldFilter{Field: "product", Op: "in", Values: []string{"API Manager"}}},
+		{name: "projectOnboardingStatus", filter: domain.CaseFieldFilter{Field: "projectOnboardingStatus", Op: "in", Values: []string{"Completed"}}},
+		{name: "projectType", filter: domain.CaseFieldFilter{Field: "projectType", Op: "in", Values: []string{"00000000-0000-0000-0000-000000000000"}}},
+		{name: "integrationCsTeam", filter: domain.CaseFieldFilter{Field: "integrationCsTeam", Op: "in", Values: []string{"00000000-0000-0000-0000-000000000000"}}},
+		{name: "assignedUserId isEmpty (Unassigned)", filter: domain.CaseFieldFilter{Field: "assignedUserId", Op: "isEmpty"}},
+		{name: "resolutionNotes isEmpty", filter: domain.CaseFieldFilter{Field: "resolutionNotes", Op: "isEmpty"}},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			req := domain.SearchCasesRequest{Filters: domain.SearchCasesFilters{
+				Filters: []domain.CaseFieldFilter{tc.filter},
+			}}
+			_, err := svc.SearchCases(ctx, req)
+			var ve *apierror.ValidationError
+			if !asValidationError(err, &ve) {
+				t.Fatalf("expected *apierror.ValidationError, got %T: %v", err, err)
+			}
+		})
+	}
+}
+
+// TestCaseService_SearchCases_SupportedFieldsStillReachRepository proves the
+// 11 fields the Postgres repository does support are not caught by the new
+// unsupported-field rejection: each reaches repo.SearchCases unchanged.
+func TestCaseService_SearchCases_SupportedFieldsStillReachRepository(t *testing.T) {
+	uuid1 := "00000000-0000-0000-0000-000000000001"
+
+	cases := []struct {
+		name   string
+		filter domain.CaseFieldFilter
+	}{
+		{name: "type", filter: domain.CaseFieldFilter{Field: "type", Op: "in", Values: []string{"case"}}},
+		{name: "projectId", filter: domain.CaseFieldFilter{Field: "projectId", Op: "in", Values: []string{uuid1}}},
+		{name: "deploymentId", filter: domain.CaseFieldFilter{Field: "deploymentId", Op: "in", Values: []string{uuid1}}},
+		{name: "state", filter: domain.CaseFieldFilter{Field: "state", Op: "in", Values: []string{"open"}}},
+		{name: "severity", filter: domain.CaseFieldFilter{Field: "severity", Op: "in", Values: []string{"high"}}},
+		{name: "issueType", filter: domain.CaseFieldFilter{Field: "issueType", Op: "in", Values: []string{"error"}}},
+		{name: "engagementType", filter: domain.CaseFieldFilter{Field: "engagementType", Op: "in", Values: []string{"migration"}}},
+		{name: "createdBy", filter: domain.CaseFieldFilter{Field: "createdBy", Op: "in", Values: []string{"a@example.com"}}},
+		{name: "workState", filter: domain.CaseFieldFilter{Field: "workState", Op: "in", Values: []string{"ongoing"}}},
+		{name: "assignedUserId in", filter: domain.CaseFieldFilter{Field: "assignedUserId", Op: "in", Values: []string{uuid1}}},
+		{name: "createdOn gte", filter: domain.CaseFieldFilter{Field: "createdOn", Op: "gte", Values: []string{"2026-01-01"}}},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			called := false
+			repo := &stubCaseRepo{
+				searchCases: func(ctx context.Context, req domain.SearchCasesRequest) ([]domain.SearchCaseView, int, error) {
+					called = true
+					return nil, 0, nil
+				},
+			}
+			svc := NewCaseService(repo, stubUserRepo{})
+			ctx := contextWithUserIDToken(fakeJWTWithEmail(t, "jane.doe@example.com"))
+
+			req := domain.SearchCasesRequest{Filters: domain.SearchCasesFilters{
+				Filters: []domain.CaseFieldFilter{tc.filter},
+			}}
+			if _, err := svc.SearchCases(ctx, req); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if !called {
+				t.Fatalf("expected repo.SearchCases to be called for supported field %q", tc.name)
+			}
+		})
+	}
+}
diff --git a/entity-service/internal/service/sn_case_service.go b/entity-service/internal/service/sn_case_service.go
index 91019f7174..45261d893c 100644
--- a/entity-service/internal/service/sn_case_service.go
+++ b/entity-service/internal/service/sn_case_service.go
@@ -1960,6 +1960,33 @@ func (s *snCaseService) SearchCases(ctx context.Context, req domain.SearchCasesR
 			return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: "type contains invalid value: " + t}
 		}
 	}
+	// domainStatesToSNIDs/domainSeveritiesToSNIDs/domainIssueTypesToSNIDs/
+	// domainEngagementTypesToSNIDs silently skip unrecognized values, which
+	// omitempty then drops from the SN payload entirely -- validate up front
+	// so an unrecognized value errors instead of silently widening the result
+	// set. Validated against the same validXxx maps the Postgres backend uses
+	// (confirmed to cover the exact same value sets as the snXxxIDMap maps
+	// this backend converts through).
+	for _, st := range req.Parsed.States {
+		if !validCaseState[st] {
+			return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: "state contains invalid value: " + string(st)}
+		}
+	}
+	for _, sv := range req.Parsed.Severities {
+		if !validCaseSeverity[sv] {
+			return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: "severity contains invalid value: " + string(sv)}
+		}
+	}
+	for _, it := range req.Parsed.IssueTypes {
+		if !validCaseIssueType[it] {
+			return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: "issueType contains invalid value: " + string(it)}
+		}
+	}
+	for _, et := range req.Parsed.EngagementTypes {
+		if !validEngagementType[et] {
+			return domain.SearchCasesResponse{}, &apierror.ValidationError{Msg: "engagementType contains invalid value: " + string(et)}
+		}
+	}
 
 	snFilters := buildSNCaseFilters(req.Parsed, req.Filters.SearchQuery)
 
@@ -1997,11 +2024,17 @@ func (s *snCaseService) SearchCases(ctx context.Context, req domain.SearchCasesR
 			caseTypeDomain = *t
 		}
 
+		updatedOn := c.CreatedOn
+		if c.UpdatedOn != nil && *c.UpdatedOn != "" {
+			updatedOn = *c.UpdatedOn
+		}
+
 		cv := domain.SearchCaseView{
 			ID:         sysidToUUID(c.ID),
 			Number:     c.Number,
 			InternalID: c.InternalID,
 			CreatedOn:  c.CreatedOn,
+			UpdatedOn:  updatedOn,
 			CreatedBy:  c.CreatedBy,
 			// The case search carries no id for the creator, only the email and
 			// full name, so the canonical reference is emitted with a null id.
diff --git a/entity-service/internal/service/sn_case_service_test.go b/entity-service/internal/service/sn_case_service_test.go
index 9778737960..d59f15953a 100644
--- a/entity-service/internal/service/sn_case_service_test.go
+++ b/entity-service/internal/service/sn_case_service_test.go
@@ -1026,6 +1026,133 @@ func TestSNCaseService_SearchCases_RejectsBadFilterFieldAndCombo(t *testing.T) {
 	})
 }
 
+// TestSNCaseService_SearchCases_RejectsUnrecognizedEnumValues proves that
+// State/Severity/IssueType/EngagementType filter values not present in the
+// domain's validXxx maps are rejected outright, rather than being silently
+// dropped by domainStatesToSNIDs/domainSeveritiesToSNIDs/domainIssueTypesToSNIDs/
+// domainEngagementTypesToSNIDs (which skip unrecognized values, producing an
+// empty key slice that omitempty then drops from the SN payload entirely --
+// previously this widened the result set instead of erroring).
+func TestSNCaseService_SearchCases_RejectsUnrecognizedEnumValues(t *testing.T) {
+	client := newTestSNClient(t, http.NewServeMux())
+	svc := NewServiceNowCaseService(client, nil)
+	ctx := contextWithUserIDToken(fakeJWTWithEmail(t, "jane.doe@example.com"))
+
+	cases := []struct {
+		name   string
+		filter domain.CaseFieldFilter
+	}{
+		{name: "state", filter: domain.CaseFieldFilter{Field: "state", Op: "in", Values: []string{"bogus_state"}}},
+		{name: "severity", filter: domain.CaseFieldFilter{Field: "severity", Op: "in", Values: []string{"bogus_severity"}}},
+		{name: "issueType", filter: domain.CaseFieldFilter{Field: "issueType", Op: "in", Values: []string{"bogus_issue_type"}}},
+		{name: "engagementType", filter: domain.CaseFieldFilter{Field: "engagementType", Op: "in", Values: []string{"bogus_engagement_type"}}},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			req := domain.SearchCasesRequest{Filters: domain.SearchCasesFilters{
+				Filters: []domain.CaseFieldFilter{tc.filter},
+			}}
+			_, err := svc.SearchCases(ctx, req)
+			if _, ok := err.(*apierror.ValidationError); !ok {
+				t.Fatalf("expected *apierror.ValidationError, got %T: %v", err, err)
+			}
+		})
+	}
+}
+
+// TestSNCaseService_SearchCases_AcceptsAllPreviouslyValidEnumValues proves the
+// new enum validation added alongside TestSNCaseService_SearchCases_RejectsUnrecognizedEnumValues
+// does not newly reject any value that was previously forwarded to SN, for
+// each of State/Severity/IssueType/EngagementType.
+func TestSNCaseService_SearchCases_AcceptsAllPreviouslyValidEnumValues(t *testing.T) {
+	mux := http.NewServeMux()
+	mux.HandleFunc("/cases/search", func(w http.ResponseWriter, r *http.Request) {
+		_ = json.NewEncoder(w).Encode(map[string]any{"cases": []map[string]any{}, "total": 0, "offset": 0, "limit": 20})
+	})
+	client := newTestSNClient(t, mux)
+	svc := NewServiceNowCaseService(client, nil)
+	ctx := contextWithUserIDToken(fakeJWTWithEmail(t, "jane.doe@example.com"))
+
+	allStates := make([]string, 0, len(validCaseState))
+	for s := range validCaseState {
+		allStates = append(allStates, string(s))
+	}
+	allSeverities := make([]string, 0, len(validCaseSeverity))
+	for s := range validCaseSeverity {
+		allSeverities = append(allSeverities, string(s))
+	}
+	allIssueTypes := make([]string, 0, len(validCaseIssueType))
+	for s := range validCaseIssueType {
+		allIssueTypes = append(allIssueTypes, string(s))
+	}
+	allEngagementTypes := make([]string, 0, len(validEngagementType))
+	for s := range validEngagementType {
+		allEngagementTypes = append(allEngagementTypes, string(s))
+	}
+
+	req := domain.SearchCasesRequest{Filters: domain.SearchCasesFilters{
+		Filters: []domain.CaseFieldFilter{
+			{Field: "state", Op: "in", Values: allStates},
+			{Field: "severity", Op: "in", Values: allSeverities},
+			{Field: "issueType", Op: "in", Values: allIssueTypes},
+			{Field: "engagementType", Op: "in", Values: allEngagementTypes},
+		},
+	}}
+	if _, err := svc.SearchCases(ctx, req); err != nil {
+		t.Fatalf("unexpected error for previously-valid enum values: %v", err)
+	}
+}
+
+// TestSNCaseService_SearchCases_PopulatesUpdatedOn proves SearchCases carries
+// a real, non-empty updatedOn distinct from createdOn when the SN response
+// supplies one, fixing the case-list "Updated" column always showing the
+// created date.
+func TestSNCaseService_SearchCases_PopulatesUpdatedOn(t *testing.T) {
+	mux := http.NewServeMux()
+	mux.HandleFunc("/cases/search", func(w http.ResponseWriter, r *http.Request) {
+		_ = json.NewEncoder(w).Encode(map[string]any{
+			"cases": []map[string]any{
+				{
+					"id":         "case-sys-id",
+					"internalId": "INT-1",
+					"number":     "CS0001",
+					"title":      "t",
+					"description": "d",
+					"createdOn":  "2026-01-01 00:00:00",
+					"updatedOn":  "2026-01-15 12:30:00",
+					"createdBy":  "jane.doe@example.com",
+					"project":    map[string]any{"id": "proj-sys-id", "name": "Proj"},
+					"deployment": map[string]any{"id": "", "name": ""},
+					"deployedProduct": map[string]any{"id": "", "name": "", "product": map[string]any{"id": "", "name": ""}},
+				},
+			},
+			"total": 1, "offset": 0, "limit": 20,
+		})
+	})
+	client := newTestSNClient(t, mux)
+	svc := NewServiceNowCaseService(client, nil)
+	ctx := contextWithUserIDToken(fakeJWTWithEmail(t, "jane.doe@example.com"))
+
+	resp, err := svc.SearchCases(ctx, domain.SearchCasesRequest{})
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if len(resp.Cases) != 1 {
+		t.Fatalf("expected 1 case, got %d", len(resp.Cases))
+	}
+	got := resp.Cases[0]
+	if got.UpdatedOn == "" {
+		t.Fatalf("expected non-empty UpdatedOn")
+	}
+	if got.UpdatedOn == got.CreatedOn {
+		t.Fatalf("expected UpdatedOn %q to differ from CreatedOn %q", got.UpdatedOn, got.CreatedOn)
+	}
+	if got.UpdatedOn != "2026-01-15 12:30:00" {
+		t.Fatalf("UpdatedOn = %q, want the SN updatedOn field value", got.UpdatedOn)
+	}
+}
+
 func TestSNCaseService_SearchTags_Success(t *testing.T) {
 	var gotQuery string
 	mux := http.NewServeMux()
diff --git a/entity-service/openapi.yaml b/entity-service/openapi.yaml
index ceef0bf309..b6f3d4b279 100644
--- a/entity-service/openapi.yaml
+++ b/entity-service/openapi.yaml
@@ -5263,6 +5263,9 @@ components:
         createdOn:
           type: string
           description: Creation timestamp. RFC3339 for Postgres; raw SN timestamp string for ServiceNow.
+        updatedOn:
+          type: string
+          description: Last-updated timestamp. RFC3339 for Postgres; raw SN timestamp string for ServiceNow.
         createdBy:
           type: string
           format: email