diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index b51044388..08d7ec087 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -47,14 +47,17 @@
 <#macro collatedObjectPropertyList property editable template=property.template>
     <#assign subclasses = property.subclasses>
     <#list subclasses?keys as subclass>
-        <li class="subclass">
-            <#if subclass?has_content>
+        <#if subclass?has_content>
+            <li class="subclass" role="listitem">
                 <h3>${subclass?lower_case}</h3>
-            </#if>
-            <ul class="subclass-property-list">
-                <@objectPropertyList property editable subclasses[subclass] template/>
-            </ul>
-        </li>
+                <ul class="subclass-property-list">
+                    <@objectPropertyList property editable subclasses[subclass] template/>
+                </ul>
+            </li>
+        <#else>
+            <#-- If not in a subclass, list the statements in the top level ul, not nested -->
+            <@objectPropertyList property editable subclasses[subclass] template/>
+        </#if>
     </#list>
 </#macro>