diff --git a/templating/internal/units.py b/templating/internal/units.py
index f176a4b9f..f8cb0f155 100644
--- a/templating/internal/units.py
+++ b/templating/internal/units.py
@@ -79,7 +79,7 @@ def _load_schemas():
                     value_type = "[%s]" % nested_object[0]["title"]
                     tables += nested_object
                 else:
-                    value_type = "[%s]" % props[key_name]["type"]
+                    value_type = "[%s]" % props[key_name]["items"]["type"]
             else:
                 value_type = props[key_name]["type"]
 
@@ -129,7 +129,7 @@ def _load_schemas():
 
             # add summary and desc
             schema["title"] = json_schema.get("title")
-            schema["desc"] = json_schema.get("description")
+            schema["desc"] = json_schema.get("description", "")
 
             # walk the object for field info
             schema["content_fields"] = get_content_fields(
diff --git a/templating/templates/events.tmpl b/templating/templates/events.tmpl
index 778b2df27..72501fac0 100644
--- a/templating/templates/events.tmpl
+++ b/templating/templates/events.tmpl
@@ -1,6 +1,6 @@
 ``{{event.type}}``
 {{(4 + event.type | length) * '-'}}
-{{event.desc or ""}}
+{{event.desc | wrap(80)}}
 {% for table in event.content_fields -%}
 {{"``"+table.title+"``" if table.title else ""}}