diff --git a/docs/components/select-rich/use-cases.md b/docs/components/select-rich/use-cases.md
index c8674af5e..6d0ebee56 100644
--- a/docs/components/select-rich/use-cases.md
+++ b/docs/components/select-rich/use-cases.md
@@ -40,7 +40,15 @@ export const optionsWithHTML = () => html`
 ## Many Options with Scrolling
 
 ```js preview-story
-export const manyOptionsWithScrolling = () => html`
+export const manyOptionsWithScrolling = () => {
+  const modelValues = [
+    { value: 'red', checked: false },
+    { value: 'hotpink', checked: true },
+    { value: 'teal', checked: false },
+    { value: 'green', checked: false },
+    { value: 'blue', checked: false },
+  ];
+  return html`
   <style>
     #scrollSelectRich lion-options {
       max-height: 200px;
@@ -49,23 +57,24 @@ export const manyOptionsWithScrolling = () => html`
     }
   </style>
   <lion-select-rich id="scrollSelectRich" label="Favorite color" name="color">
-    <lion-option .modelValue="${{ value: 'red', checked: false }}">
+    <lion-option .modelValue="${modelValues[0]}">
       <p style="color: red;">I am red</p>
     </lion-option>
-    <lion-option .modelValue="${{ value: 'hotpink', checked: true }}">
+    <lion-option .modelValue="${modelValues[1]}">
       <p style="color: hotpink;">I am hotpink</p>
     </lion-option>
-    <lion-option .modelValue="${{ value: 'teal', checked: false }}">
+    <lion-option .modelValue="${modelValues[2]}">
       <p style="color: teal;">I am teal</p>
     </lion-option>
-    <lion-option .modelValue="${{ value: 'green', checked: false }}">
+    <lion-option .modelValue="${modelValues[3]}">
       <p style="color: green;">I am green</p>
     </lion-option>
-    <lion-option .modelValue"=${{ value: 'blue', checked: false }}">
+    <lion-option .modelValue"=${modelValues[4]}">
       <p style="color: blue;">I am blue</p>
     </lion-option>
   </lion-select-rich>
 `;
+};
 ```
 
 ## Read only prefilled
@@ -78,9 +87,9 @@ The readonly attribute is delegated to the invoker for disabling opening the ove
 ```js preview-story
 export const readOnlyPrefilled = () => html`
   <lion-select-rich label="Read-only select" readonly name="color">
-    <lion-option .modelValue=${{ value: 'red', checked: false }}>Red</lion-option>
-    <lion-option .modelValue=${{ value: 'hotpink', checked: true }}>Hotpink</lion-option>
-    <lion-option .modelValue=${{ value: 'teal', checked: false }}>Teal</lion-option>
+    <lion-option .choiceValue=${'red'}>Red</lion-option>
+    <lion-option .choiceValue=${'hotpink'} checked>Hotpink</lion-option>
+    <lion-option .choiceValue=${'teal'}>Teal</lion-option>
   </lion-select-rich>
 `;
 ```
@@ -94,9 +103,9 @@ If you disable the entire select, the disabled attribute is also delegated to th
 ```js preview-story
 export const disabledSelect = () => html`
   <lion-select-rich label="Disabled select" disabled name="color">
-    <lion-option .modelValue=${{ value: 'red', checked: false }}>Red</lion-option>
-    <lion-option .modelValue=${{ value: 'hotpink', checked: true }}>Hotpink</lion-option>
-    <lion-option .modelValue=${{ value: 'teal', checked: false }}>Teal</lion-option>
+    <lion-option .choiceValue=${'red'}>Red</lion-option>
+    <lion-option .choiceValue=${'hotpink'} checked>Hotpink</lion-option>
+    <lion-option .choiceValue=${'teal'}>Teal</lion-option>
   </lion-select-rich>
 `;
 ```
@@ -132,13 +141,10 @@ export const renderOptions = ({ shadowRoot }) => {
       2,
     );
   }
+  const mv = { value: obj, checked: false };
   return html`
     <lion-select-rich label="Credit Card" name="color" @model-value-changed=${showOutput}>
-      ${objs.map(
-        obj => html`
-          <lion-option .modelValue=${{ value: obj, checked: false }}>${obj.label}</lion-option>
-        `,
-      )}
+      ${objs.map(obj => html` <lion-option .modelValue=${mv}>${obj.label}</lion-option> `)}
     </lion-select-rich>
     <p>Full value:</p>
     <pre id="demoRenderOutput"></pre>
@@ -156,14 +162,14 @@ This changes the keyboard interaction.
 ```js preview-story
 export const interactionMode = () => html`
   <lion-select-rich label="Mac mode" name="color" interaction-mode="mac">
-    <lion-option .modelValue=${{ value: 'red', checked: false }}>Red</lion-option>
-    <lion-option .modelValue=${{ value: 'hotpink', checked: true }}>Hotpink</lion-option>
-    <lion-option .modelValue=${{ value: 'teal', checked: false }}>Teal</lion-option>
+    <lion-option .choiceValue=${'red'}>Red</lion-option>
+    <lion-option .choiceValue=${'hotpink'} checked>Hotpink</lion-option>
+    <lion-option .choiceValue=${'teal'}>Teal</lion-option>
   </lion-select-rich>
   <lion-select-rich label="Windows/Linux mode" name="color" interaction-mode="windows/linux">
-    <lion-option .modelValue=${{ value: 'red', checked: false }}>Red</lion-option>
-    <lion-option .modelValue=${{ value: 'hotpink', checked: true }}>Hotpink</lion-option>
-    <lion-option .modelValue=${{ value: 'teal', checked: false }}>Teal</lion-option>
+    <lion-option .choiceValue=${'red'}>Red</lion-option>
+    <lion-option .choiceValue=${'hotpink'} checked>Hotpink</lion-option>
+    <lion-option .choiceValue=${'teal'}>Teal</lion-option>
   </lion-select-rich>
 `;
 ```
diff --git a/packages/ui/components/overlays/src/OverlayController.js b/packages/ui/components/overlays/src/OverlayController.js
index 4fab05565..c5fb88224 100644
--- a/packages/ui/components/overlays/src/OverlayController.js
+++ b/packages/ui/components/overlays/src/OverlayController.js
@@ -207,7 +207,7 @@ export class OverlayController extends EventTarget {
 
     this.manager.add(this);
     /** @protected */
-    this._contentId = `overlay-content--${Math.random().toString(36).substr(2, 10)}`;
+    this._contentId = `overlay-content--${Math.random().toString(36).slice(2, 10)}`;
     /** @private */
     this.__originalAttrs = new Map();
     this.updateConfig(config);
diff --git a/packages/ui/components/select-rich/src/LionSelectRich.js b/packages/ui/components/select-rich/src/LionSelectRich.js
index f00a38e7c..9ead08682 100644
--- a/packages/ui/components/select-rich/src/LionSelectRich.js
+++ b/packages/ui/components/select-rich/src/LionSelectRich.js
@@ -67,14 +67,11 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
     `;
   }
 
+  /** @type {SlotsMap} */
   get slots() {
     return {
       ...super.slots,
-      invoker: () => {
-        const invokerEl = this.createScopedElement('lion-select-invoker');
-        invokerEl.setAttribute('data-tag-name', 'lion-select-invoker');
-        return invokerEl;
-      },
+      invoker: () => html`<lion-select-invoker></lion-select-invoker>`,
     };
   }