diff --git a/vocabularies/Hierarchy.json b/vocabularies/Hierarchy.json
index d042e8266..3a64cd40f 100644
--- a/vocabularies/Hierarchy.json
+++ b/vocabularies/Hierarchy.json
@@ -47,11 +47,11 @@
         "@Core.Description": "Drill state of an entry",
         "@Validation.AllowedValues": [
           { "Value": "expanded", "@Core.Description": "The entry precedes entries from deeper aggregation levels" },
+          { "Value": "leaf", "@Core.Description": "The entry belongs to the deepest aggregation level" },
           {
             "Value": "collapsed",
-            "@Core.Description": "The entry belongs to the highest non-expanded aggregation level, but not the deepest"
-          },
-          { "Value": "leaf", "@Core.Description": "The entry belongs to the deepest aggregation level" }
+            "@Core.Description": "The entry belongs to the highest non-expanded aggregation level, but is not a leaf"
+          }
         ]
       },
       "DistanceFromRoot": {
diff --git a/vocabularies/Hierarchy.md b/vocabularies/Hierarchy.md
index d90b1ca00..c90af60e6 100644
--- a/vocabularies/Hierarchy.md
+++ b/vocabularies/Hierarchy.md
@@ -101,7 +101,7 @@ The properties in this complex type contain information about
 Property|Type|Description
 :-------|:---|:----------
 [LimitedDescendantCount](./Hierarchy.xml#L58:~:text=<ComplexType%20Name="-,HierarchyType,-")|Int64?|Number of entries from deeper aggregation levels that are expanded
-[DrillState](./Hierarchy.xml#L61:~:text=<ComplexType%20Name="-,HierarchyType,-")|String?|Drill state of an entry<dl>Allowed values:<dt>[expanded](./Hierarchy.xml#L65)<dd>The entry precedes entries from deeper aggregation levels<dt>[collapsed](./Hierarchy.xml#L69)<dd>The entry belongs to the highest non-expanded aggregation level, but not the deepest<dt>[leaf](./Hierarchy.xml#L73)<dd>The entry belongs to the deepest aggregation level</dl>
+[DrillState](./Hierarchy.xml#L61:~:text=<ComplexType%20Name="-,HierarchyType,-")|String?|Drill state of an entry<dl>Allowed values:<dt>[expanded](./Hierarchy.xml#L65)<dd>The entry precedes entries from deeper aggregation levels<dt>[leaf](./Hierarchy.xml#L69)<dd>The entry belongs to the deepest aggregation level<dt>[collapsed](./Hierarchy.xml#L73)<dd>The entry belongs to the highest non-expanded aggregation level, but is not a leaf</dl>
 [DistanceFromRoot](./Hierarchy.xml#L80:~:text=<ComplexType%20Name="-,HierarchyType,-")|Int64?|Position of the current aggregation level in the list of all aggregation levels
 
 <a name="RecursiveHierarchyType"></a>
diff --git a/vocabularies/Hierarchy.xml b/vocabularies/Hierarchy.xml
index cc4212237..17108c70e 100644
--- a/vocabularies/Hierarchy.xml
+++ b/vocabularies/Hierarchy.xml
@@ -66,14 +66,14 @@
                 <PropertyValue Property="Value" String="expanded" />
                 <Annotation Term="Core.Description" String="The entry precedes entries from deeper aggregation levels" />
               </Record>
-              <Record>
-                <PropertyValue Property="Value" String="collapsed" />
-                <Annotation Term="Core.Description" String="The entry belongs to the highest non-expanded aggregation level, but not the deepest" />
-              </Record>
               <Record>
                 <PropertyValue Property="Value" String="leaf" />
                 <Annotation Term="Core.Description" String="The entry belongs to the deepest aggregation level" />
               </Record>
+              <Record>
+                <PropertyValue Property="Value" String="collapsed" />
+                <Annotation Term="Core.Description" String="The entry belongs to the highest non-expanded aggregation level, but is not a leaf" />
+              </Record>
             </Collection>
           </Annotation>
         </Property>