diff --git a/data/fields/geological_outcrop.json b/data/fields/geological_outcrop.json
new file mode 100644
index 0000000000..69f7b91fc9
--- /dev/null
+++ b/data/fields/geological_outcrop.json
@@ -0,0 +1,11 @@
+{
+    "key": "geological",
+    "type": "defaultCheck",
+    "label": "Exposed Bedrock",
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "outcrop": "Yes"
+        }
+    }
+}
diff --git a/data/fields/geological_volcanic_lava_field.json b/data/fields/geological_volcanic_lava_field.json
new file mode 100644
index 0000000000..473e2de7e8
--- /dev/null
+++ b/data/fields/geological_volcanic_lava_field.json
@@ -0,0 +1,11 @@
+{
+    "key": "geological",
+    "type": "defaultCheck",
+    "label": "Lava Field",
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "volcanic_lava_field": "Yes"
+        }
+    }
+}
diff --git a/data/presets/natural/bare_rock.json b/data/presets/natural/bare_rock.json
index c9ef90dd45..d586fbcccf 100644
--- a/data/presets/natural/bare_rock.json
+++ b/data/presets/natural/bare_rock.json
@@ -1,5 +1,8 @@
 {
     "icon": "temaki-boulder3",
+    "moreFields": [
+        "geological_volcanic_lava_field"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/natural/rock.json b/data/presets/natural/rock.json
index 38ea34d92d..032a18ffc3 100644
--- a/data/presets/natural/rock.json
+++ b/data/presets/natural/rock.json
@@ -1,7 +1,14 @@
 {
     "icon": "temaki-boulder2",
     "fields": [
-        "name"
+        "name",
+        "height",
+        "geological_outcrop"
+    ],
+    "moreFields": [
+        "width",
+        "diameter",
+        "start_date"
     ],
     "geometry": [
         "point",
@@ -13,7 +20,13 @@
     "terms": [
         "boulder",
         "stone",
-        "rock"
+        "attached rock",
+        "cairn",
+        "bedrock",
+        "outcrop",
+        "exposed rock",
+        "decorative boulder",
+        "landscape boulder"
     ],
-    "name": "Attached Rock / Boulder"
+    "name": "Rock"
 }
diff --git a/data/presets/natural/stone.json b/data/presets/natural/stone.json
index 423ab638b9..5877e48a28 100644
--- a/data/presets/natural/stone.json
+++ b/data/presets/natural/stone.json
@@ -1,7 +1,12 @@
 {
     "icon": "temaki-boulder1",
     "fields": [
-        "name"
+        "name",
+        "height"
+    ],
+    "moreFields": [
+        "width",
+        "diameter"
     ],
     "geometry": [
         "point",
@@ -11,9 +16,13 @@
         "natural": "stone"
     },
     "terms": [
-        "boulder",
         "stone",
-        "rock"
+        "rock",
+        "findling",
+        "erratic"
+    ],
+    "aliases": [
+        "Boulder"
     ],
-    "name": "Unattached Stone / Boulder"
+    "name": "Glacial Erratic"
 }