diff --git a/data/fields/education.json b/data/fields/education.json
new file mode 100644
index 00000000..88646dc0
--- /dev/null
+++ b/data/fields/education.json
@@ -0,0 +1,5 @@
+{
+    "key": "education",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/education.json b/data/presets/education.json
new file mode 100644
index 00000000..a17c4366
--- /dev/null
+++ b/data/presets/education.json
@@ -0,0 +1,39 @@
+{
+    "icon": "temaki-school",
+    "fields": [
+        "name",
+        "education",
+        "operator",
+        "address",
+        "building_area",
+        "phone",
+        "website"
+    ],
+    "moreFields": [
+        "{@templates/contact}",
+        "branch_brand",
+        "brand",
+        "building/levels_building",
+        "gnis/feature_id-US",
+        "height_building",
+        "level",
+        "opening_hours",
+        "payment_multi",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "education": "*"
+    },
+    "terms": [
+        "classes",
+        "school",
+        "teaching",
+        "training"
+    ],
+    "name": "Education Facility",
+    "matchScore": 0.4
+}
diff --git a/data/presets/education/_yes.json b/data/presets/education/_yes.json
new file mode 100644
index 00000000..80be3dfc
--- /dev/null
+++ b/data/presets/education/_yes.json
@@ -0,0 +1,18 @@
+{
+    "icon": "temaki-school",
+    "fields": [
+        "name",
+        "education",
+        "{education}"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "education": "yes"
+    },
+    "searchable": false,
+    "matchScore": 0.5,
+    "name": "Education Facility (Unspecified Type)"
+}
diff --git a/data/presets/amenity/college.json b/data/presets/education/college.json
similarity index 77%
rename from data/presets/amenity/college.json
rename to data/presets/education/college.json
index aa33b04b..836083c9 100644
--- a/data/presets/amenity/college.json
+++ b/data/presets/education/college.json
@@ -26,5 +26,13 @@
     "tags": {
         "amenity": "college"
     },
+    "addTags": {
+        "amenity": "college",
+        "education": "college"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "college"
+    },
     "name": "College Grounds"
 }
diff --git a/data/presets/leisure/dancing_school.json b/data/presets/education/dancing_school.json
similarity index 75%
rename from data/presets/leisure/dancing_school.json
rename to data/presets/education/dancing_school.json
index e12acf0e..7d3bb7f3 100644
--- a/data/presets/leisure/dancing_school.json
+++ b/data/presets/education/dancing_school.json
@@ -27,6 +27,14 @@
     "tags": {
         "amenity": "dancing_school"
     },
+    "addTags": {
+        "amenity": "dancing_school",
+        "education": "dancing_school"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "dancing_school"
+    },
     "name": "Dance School",
     "aliases": [
         "Dance Studio"
diff --git a/data/presets/amenity/driving_school.json b/data/presets/education/driving_school.json
similarity index 68%
rename from data/presets/amenity/driving_school.json
rename to data/presets/education/driving_school.json
index 8b1c1b39..365ef9ff 100644
--- a/data/presets/amenity/driving_school.json
+++ b/data/presets/education/driving_school.json
@@ -19,5 +19,13 @@
     "tags": {
         "amenity": "driving_school"
     },
+    "addTags": {
+        "amenity": "driving_school",
+        "education": "driving_school"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "driving_school"
+    },
     "name": "Driving School"
 }
diff --git a/data/presets/amenity/kindergarten.json b/data/presets/education/kindergarten.json
similarity index 81%
rename from data/presets/amenity/kindergarten.json
rename to data/presets/education/kindergarten.json
index e2f889f6..8b0b2deb 100644
--- a/data/presets/amenity/kindergarten.json
+++ b/data/presets/education/kindergarten.json
@@ -36,5 +36,13 @@
     "tags": {
         "amenity": "kindergarten"
     },
+    "addTags": {
+        "amenity": "kindergarten",
+        "education": "kindergarten"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "kindergarten"
+    },
     "name": "Preschool / Kindergarten Grounds"
 }
diff --git a/data/presets/amenity/language_school.json b/data/presets/education/language_school.json
similarity index 75%
rename from data/presets/amenity/language_school.json
rename to data/presets/education/language_school.json
index 6eadf07c..ad866dfb 100644
--- a/data/presets/amenity/language_school.json
+++ b/data/presets/education/language_school.json
@@ -27,5 +27,13 @@
     "tags": {
         "amenity": "language_school"
     },
+    "addTags": {
+        "amenity": "language_school",
+        "education": "language_school"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "language_school"
+    },
     "name": "Language School"
 }
diff --git a/data/presets/amenity/music_school.json b/data/presets/education/music_school.json
similarity index 69%
rename from data/presets/amenity/music_school.json
rename to data/presets/education/music_school.json
index c4fcaa6c..94351702 100644
--- a/data/presets/amenity/music_school.json
+++ b/data/presets/education/music_school.json
@@ -20,5 +20,13 @@
     "tags": {
         "amenity": "music_school"
     },
+    "addTags": {
+        "amenity": "music_school",
+        "education": "music_school"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "music_school"
+    },
     "name": "Music School"
 }
diff --git a/data/presets/amenity/prep_school.json b/data/presets/education/prep_school.json
similarity index 75%
rename from data/presets/amenity/prep_school.json
rename to data/presets/education/prep_school.json
index ca12aa7a..5dc65478 100644
--- a/data/presets/amenity/prep_school.json
+++ b/data/presets/education/prep_school.json
@@ -28,5 +28,13 @@
     "tags": {
         "amenity": "prep_school"
     },
+    "addTags": {
+        "amenity": "prep_school",
+        "education": "prep_school"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "prep_school"
+    },
     "name": "Test Prep / Tutoring School"
 }
diff --git a/data/presets/amenity/school.json b/data/presets/education/school.json
similarity index 84%
rename from data/presets/amenity/school.json
rename to data/presets/education/school.json
index 20662a24..c70816da 100644
--- a/data/presets/amenity/school.json
+++ b/data/presets/education/school.json
@@ -39,5 +39,13 @@
     "tags": {
         "amenity": "school"
     },
+    "addTags": {
+        "amenity": "school",
+        "education": "school"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "school"
+    },
     "name": "School Grounds"
 }
diff --git a/data/presets/amenity/university.json b/data/presets/education/university.json
similarity index 70%
rename from data/presets/amenity/university.json
rename to data/presets/education/university.json
index 4b71ffdf..fce98668 100644
--- a/data/presets/amenity/university.json
+++ b/data/presets/education/university.json
@@ -19,5 +19,13 @@
     "tags": {
         "amenity": "university"
     },
+    "addTags": {
+        "amenity": "university",
+        "education": "university"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "university"
+    },
     "name": "University Grounds"
 }