diff --git a/doc/etemplate2/_includes/component.njk b/doc/etemplate2/_includes/component.njk
index 58094a7106..988694a1a7 100644
--- a/doc/etemplate2/_includes/component.njk
+++ b/doc/etemplate2/_includes/component.njk
@@ -163,8 +163,13 @@
         {% for event in component.events %}
           <tr>
             <td data-flavor="html"><code class="nowrap">{{ event.name }}</code></td>
-            <td data-flavor="react"><code class="nowrap">{{ event.reactName }}</code></td>
-            <td>{{ event.description | markdownInline | safe }}</td>
+            <td>
+              {% if event.description %}
+                {{ event.description | markdownInline | safe }}
+			  {% else %}
+			    EVENT NEEDS A DESCRIPTION
+              {% endif %}
+			</td>
             <td>
               {% if event.type.text %}
                 <code>{{ event.type.text }}</code>
diff --git a/doc/etemplate2/_includes/sidebar.njk b/doc/etemplate2/_includes/sidebar.njk
index 921035201b..3996a89063 100644
--- a/doc/etemplate2/_includes/sidebar.njk
+++ b/doc/etemplate2/_includes/sidebar.njk
@@ -24,9 +24,13 @@
     <li><em><a href="/components/sandbox">Sandbox</a></em></li>
       {% for component in meta.components %}
         <li>
+          {% if component.tagName %}
           <a href="/components/{{ component.tagName | removeSlPrefix }}">
             {{ component.name | classNameToComponentName }}
           </a>
+          {% else %}
+            {{ component.name }}
+          {% endif %}
         </li>
       {% endfor %}
     </ul>
diff --git a/doc/etemplate2/_utilities/cem.cjs b/doc/etemplate2/_utilities/cem.cjs
index db0c93a09b..3a3c9eb863 100644
--- a/doc/etemplate2/_utilities/cem.cjs
+++ b/doc/etemplate2/_utilities/cem.cjs
@@ -22,8 +22,8 @@ module.exports.getAllComponents = function ()
 				declaration.path = module.path.replace(/^src\//, 'dist/').replace(/\.ts$/, '.js');
 
 				// Remove members that are private or don't have a description
-				const members = declaration.members?.filter(member => member.description && member.privacy !== 'private');
-				const methods = members?.filter(prop => prop.kind === 'method' && prop.privacy !== 'private');
+				const members = declaration.members?.filter(member => member.description && member.privacy !== 'private') || [];
+				const methods = members?.filter(prop => prop.kind === 'method' && prop.privacy !== 'private') || [];
 				const properties = members?.filter(prop =>
 				{
 					// Look for a corresponding attribute
diff --git a/doc/etemplate2/custom-elements-manifest.config.mjs b/doc/etemplate2/custom-elements-manifest.config.mjs
index f98b0ed701..ae472884ca 100644
--- a/doc/etemplate2/custom-elements-manifest.config.mjs
+++ b/doc/etemplate2/custom-elements-manifest.config.mjs
@@ -26,7 +26,7 @@ function replace(string, terms)
 }
 
 export default {
-	globs: ["api/js/etemplate/**/Et2[!DFILST]*/*.ts"],  // There's something wrong with some widgets, they break the parser
+	globs: ["api/js/etemplate/**/Et2[!DIL]*/*.ts"],  // There's something wrong with some widgets, they break the parser
 	/** Globs to exclude */
 	exclude: ["*Date*"],//, 'et2_*.ts', '**/test/*', '**/*.styles.ts', '**/*.test.ts'],
 	dev: true,