diff --git a/data/presets.yaml b/data/presets.yaml
index f0cfd5ae8..fd2f14706 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -498,6 +498,20 @@ en:
           semi_deciduous: Semi-Deciduous
           # leaf_cycle=semi_evergreen
           semi_evergreen: Semi-Evergreen
+      leaf_cycle_singular:
+        # 'leaf_cycle=*'
+        label: Leaf Cycle
+        options:
+          # leaf_cycle=deciduous
+          deciduous: Deciduous
+          # leaf_cycle=evergreen
+          evergreen: Evergreen
+          # leaf_cycle=mixed
+          mixed: Mixed
+          # leaf_cycle=semi_deciduous
+          semi_deciduous: Semi-Deciduous
+          # leaf_cycle=semi_evergreen
+          semi_evergreen: Semi-Evergreen
       leaf_type:
         # 'leaf_type=*'
         label: Leaf Type
@@ -510,6 +524,18 @@ en:
           mixed: Mixed
           # leaf_type=needleleaved
           needleleaved: Needleleaved
+      leaf_type_singular:
+        # 'leaf_type=*'
+        label: Leaf Type
+        options:
+          # leaf_type=broadleaved
+          broadleaved: Broadleaved
+          # leaf_type=leafless
+          leafless: Leafless
+          # leaf_type=mixed
+          mixed: Mixed
+          # leaf_type=needleleaved
+          needleleaved: Needleleaved
       leisure:
         # 'leisure=*'
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1097c1f9a..05765d089 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -673,6 +673,20 @@
             }
         }
     },
+    "leaf_cycle_singular": {
+        "key": "leaf_cycle",
+        "type": "combo",
+        "label": "Leaf Cycle",
+        "strings": {
+            "options": {
+                "evergreen": "Evergreen",
+                "deciduous": "Deciduous",
+                "semi_evergreen": "Semi-Evergreen",
+                "semi_deciduous": "Semi-Deciduous",
+                "mixed": "Mixed"
+            }
+        }
+    },
     "leaf_type": {
         "key": "leaf_type",
         "type": "combo",
@@ -686,6 +700,19 @@
             }
         }
     },
+    "leaf_type_singular": {
+        "key": "leaf_type",
+        "type": "combo",
+        "label": "Leaf Type",
+        "strings": {
+            "options": {
+                "broadleaved": "Broadleaved",
+                "needleleaved": "Needleleaved",
+                "mixed": "Mixed",
+                "leafless": "Leafless"
+            }
+        }
+    },
     "leisure": {
         "key": "leisure",
         "type": "typeCombo",
diff --git a/data/presets/fields/leaf_cycle_singular.json b/data/presets/fields/leaf_cycle_singular.json
new file mode 100644
index 000000000..32f60ce1f
--- /dev/null
+++ b/data/presets/fields/leaf_cycle_singular.json
@@ -0,0 +1,13 @@
+{
+    "key": "leaf_cycle",
+    "type": "combo",
+    "label": "Leaf Cycle",
+    "strings": {
+        "options": {
+            "evergreen": "Evergreen",
+            "deciduous": "Deciduous",
+            "semi_evergreen": "Semi-Evergreen",
+            "semi_deciduous": "Semi-Deciduous"
+        }
+    }
+}
diff --git a/data/presets/fields/leaf_type_singular.json b/data/presets/fields/leaf_type_singular.json
new file mode 100644
index 000000000..424eaad9a
--- /dev/null
+++ b/data/presets/fields/leaf_type_singular.json
@@ -0,0 +1,12 @@
+{
+    "key": "leaf_type",
+    "type": "combo",
+    "label": "Leaf Type",
+    "strings": {
+        "options": {
+            "broadleaved": "Broadleaved",
+            "needleleaved": "Needleleaved",
+            "leafless": "Leafless"
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7c95fab27..658a9df48 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6080,8 +6080,8 @@
     },
     "natural/tree": {
         "fields": [
-            "leaf_type",
-            "leaf_cycle",
+            "leaf_type_singular",
+            "leaf_cycle_singular",
             "denotation"
         ],
         "icon": "park",
diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json
index 218a3fe44..d3f6d8c90 100644
--- a/data/presets/presets/natural/tree.json
+++ b/data/presets/presets/natural/tree.json
@@ -1,7 +1,7 @@
 {
     "fields": [
-        "leaf_type",
-        "leaf_cycle",
+        "leaf_type_singular",
+        "leaf_cycle_singular",
         "denotation"
     ],
     "icon": "park",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 06fa821c2..f7e06a297 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1013,6 +1013,16 @@
                     "mixed": "Mixed"
                 }
             },
+            "leaf_cycle_singular": {
+                "label": "Leaf Cycle",
+                "options": {
+                    "evergreen": "Evergreen",
+                    "deciduous": "Deciduous",
+                    "semi_evergreen": "Semi-Evergreen",
+                    "semi_deciduous": "Semi-Deciduous",
+                    "mixed": "Mixed"
+                }
+            },
             "leaf_type": {
                 "label": "Leaf Type",
                 "options": {
@@ -1022,6 +1032,15 @@
                     "leafless": "Leafless"
                 }
             },
+            "leaf_type_singular": {
+                "label": "Leaf Type",
+                "options": {
+                    "broadleaved": "Broadleaved",
+                    "needleleaved": "Needleleaved",
+                    "mixed": "Mixed",
+                    "leafless": "Leafless"
+                }
+            },
             "leisure": {
                 "label": "Type"
             },