diff --git a/session/handler.go b/session/handler.go
index 73ac5c32ec1b..8953fb37c6c3 100644
--- a/session/handler.go
+++ b/session/handler.go
@@ -339,16 +339,16 @@ type listSessionsRequest struct {
 	//
 	// required: false
 	// in: query
-	ExpandOptions []ListSessionExpandable `json:"expand"`
+	ExpandOptions []SessionExpandable `json:"expand"`
 }
 
 // Expandable properties of a session
-// swagger:enum ListSessionExpandable
-type ListSessionExpandable string
+// swagger:enum SessionExpandable
+type SessionExpandable string
 
 const (
-	ListSessionExpandableIdentity ListSessionExpandable = "identity"
-	ListSessionExpandableDevices  ListSessionExpandable = "devices"
+	SessionExpandableIdentity SessionExpandable = "identity"
+	SessionExpandableDevices  SessionExpandable = "devices"
 )
 
 // Session List Response
@@ -440,9 +440,8 @@ type getSession struct {
 	// If no value is provided, the expandable properties are skipped.
 	//
 	// required: false
-	// enum: identity,devices
 	// in: query
-	ExpandOptions []string `json:"expand"`
+	ExpandOptions []SessionExpandable `json:"expand"`
 
 	// ID is the session's ID.
 	//
diff --git a/spec/api.json b/spec/api.json
index 5155b2e37554..f3ea406c37ec 100644
--- a/spec/api.json
+++ b/spec/api.json
@@ -4901,11 +4901,11 @@
             "in": "query",
             "name": "expand",
             "schema": {
-              "enum": [
-                "identity",
-                "devices"
-              ],
               "items": {
+                "enum": [
+                  "identity",
+                  "devices"
+                ],
                 "type": "string"
               },
               "type": "array"
diff --git a/spec/swagger.json b/spec/swagger.json
index fc38a382e4c8..dad8a7a36b25 100755
--- a/spec/swagger.json
+++ b/spec/swagger.json
@@ -1090,12 +1090,12 @@
         "operationId": "getSession",
         "parameters": [
           {
-            "enum": [
-              "identity",
-              "devices"
-            ],
             "type": "array",
             "items": {
+              "enum": [
+                "identity",
+                "devices"
+              ],
               "type": "string"
             },
             "description": "ExpandOptions is a query parameter encoded list of all properties that must be expanded in the Session.\nExample - ?expand=Identity\u0026expand=Devices\nIf no value is provided, the expandable properties are skipped.",
@@ -3251,9 +3251,9 @@
       "title": "JSONRawMessage represents a json.RawMessage that works well with JSON, SQL, and Swagger."
     },
     "NullTime": {
-      "description": "NullTime implements the Scanner interface so\nit can be used as a scan destination, similar to NullString.",
+      "description": "NullTime implements the [Scanner] interface so\nit can be used as a scan destination, similar to [NullString].",
       "type": "object",
-      "title": "NullTime represents a time.Time that may be null.",
+      "title": "NullTime represents a [time.Time] that may be null.",
       "properties": {
         "Time": {
           "type": "string",