diff --git a/data/presets.yaml b/data/presets.yaml
index 5eb20a6b5..e69156e2d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2860,6 +2860,21 @@ en:
         name: Christian Church
         # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple'
         terms: '<translate with synonyms or related terms for ''Christian Church'', separated by commas>'
+      amenity/place_of_worship/christian/jehovahs_witness:
+        # 'amenity=place_of_worship, religion=christian, denomination=jehovahs_witness'
+        name: Kingdom Hall of Jehovah's Witnesses
+        # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple'
+        terms: '<translate with synonyms or related terms for ''Kingdom Hall of Jehovah''s Witnesses'', separated by commas>'
+      amenity/place_of_worship/christian/la_luz_del_mundo:
+        # 'amenity=place_of_worship, religion=christian, denomination=la_luz_del_mundo'
+        name: La Luz del Mundo Church
+        # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple,the light of the world church'
+        terms: '<translate with synonyms or related terms for ''La Luz del Mundo Church'', separated by commas>'
+      amenity/place_of_worship/christian/quaker:
+        # 'amenity=place_of_worship, religion=christian, denomination=quaker'
+        name: Quaker Friends Meeting House
+        # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple'
+        terms: '<translate with synonyms or related terms for ''Quaker Friends Meeting House'', separated by commas>'
       amenity/place_of_worship/hindu:
         # 'amenity=place_of_worship, religion=hindu'
         name: Hindu Temple
@@ -2873,7 +2888,7 @@ en:
       amenity/place_of_worship/muslim:
         # 'amenity=place_of_worship, religion=muslim'
         name: Muslim Mosque
-        # 'terms: muslim'
+        # 'terms: islam,muslim'
         terms: '<translate with synonyms or related terms for ''Muslim Mosque'', separated by commas>'
       amenity/place_of_worship/shinto:
         # 'amenity=place_of_worship, religion=shinto'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7e333baae..6a7f5de37 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -148,9 +148,12 @@
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
     "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
+    "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"},
+    "amenity/place_of_worship/christian/la_luz_del_mundo": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple", "the light of the world church"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "la_luz_del_mundo"}, "reference": {"key": "denomination", "value": "la_luz_del_mundo"}, "name": "La Luz del Mundo Church"},
+    "amenity/place_of_worship/christian/quaker": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "quaker"}, "reference": {"key": "denomination", "value": "quaker"}, "name": "Quaker Friends Meeting House"},
     "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
     "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Jewish Synagogue"},
-    "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"},
+    "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["islam", "muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"},
     "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
     "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
diff --git a/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json b/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json
new file mode 100644
index 000000000..4a5d21b04
--- /dev/null
+++ b/data/presets/presets/amenity/place_of_worship/christian/jehovahs_witness.json
@@ -0,0 +1,40 @@
+{
+    "icon": "maki-place-of-worship",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "christian",
+        "abbey",
+        "basilica",
+        "bethel",
+        "cathedral",
+        "chancel",
+        "chantry",
+        "chapel",
+        "fold",
+        "house of God",
+        "house of prayer",
+        "house of worship",
+        "minster",
+        "mission",
+        "oratory",
+        "parish",
+        "sacellum",
+        "sanctuary",
+        "shrine",
+        "tabernacle",
+        "temple"
+    ],
+    "tags": {
+        "amenity": "place_of_worship",
+        "religion": "christian",
+        "denomination": "jehovahs_witness"
+    },
+    "reference": {
+        "key": "denomination",
+        "value": "jehovahs_witness"
+    },
+    "name": "Kingdom Hall of Jehovah's Witnesses"
+}
diff --git a/data/presets/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json b/data/presets/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json
new file mode 100644
index 000000000..ca5b89d17
--- /dev/null
+++ b/data/presets/presets/amenity/place_of_worship/christian/la_luz_del_mundo.json
@@ -0,0 +1,41 @@
+{
+    "icon": "maki-place-of-worship",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "christian",
+        "abbey",
+        "basilica",
+        "bethel",
+        "cathedral",
+        "chancel",
+        "chantry",
+        "chapel",
+        "fold",
+        "house of God",
+        "house of prayer",
+        "house of worship",
+        "minster",
+        "mission",
+        "oratory",
+        "parish",
+        "sacellum",
+        "sanctuary",
+        "shrine",
+        "tabernacle",
+        "temple",
+        "the light of the world church"
+    ],
+    "tags": {
+        "amenity": "place_of_worship",
+        "religion": "christian",
+        "denomination": "la_luz_del_mundo"
+    },
+    "reference": {
+        "key": "denomination",
+        "value": "la_luz_del_mundo"
+    },
+    "name": "La Luz del Mundo Church"
+}
diff --git a/data/presets/presets/amenity/place_of_worship/christian/quaker.json b/data/presets/presets/amenity/place_of_worship/christian/quaker.json
new file mode 100644
index 000000000..52f7259fa
--- /dev/null
+++ b/data/presets/presets/amenity/place_of_worship/christian/quaker.json
@@ -0,0 +1,40 @@
+{
+    "icon": "maki-place-of-worship",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "christian",
+        "abbey",
+        "basilica",
+        "bethel",
+        "cathedral",
+        "chancel",
+        "chantry",
+        "chapel",
+        "fold",
+        "house of God",
+        "house of prayer",
+        "house of worship",
+        "minster",
+        "mission",
+        "oratory",
+        "parish",
+        "sacellum",
+        "sanctuary",
+        "shrine",
+        "tabernacle",
+        "temple"
+    ],
+    "tags": {
+        "amenity": "place_of_worship",
+        "religion": "christian",
+        "denomination": "quaker"
+    },
+    "reference": {
+        "key": "denomination",
+        "value": "quaker"
+    },
+    "name": "Quaker Friends Meeting House"
+}
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
index 7f0c1d4a0..e7e883cee 100644
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -11,6 +11,7 @@
         "area"
     ],
     "terms": [
+        "islam",
         "muslim"
     ],
     "tags": {
diff --git a/data/taginfo.json b/data/taginfo.json
index 08b971723..6c01970a6 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -149,6 +149,9 @@
     {"key": "amenity", "value": "place_of_worship", "description": "🄿 Place of Worship", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"},
     {"key": "religion", "value": "buddhist", "description": "🄿 Buddhist Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-buddhist-15.svg?sanitize=true"},
     {"key": "religion", "value": "christian", "description": "🄿 Christian Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"},
+    {"key": "denomination", "value": "jehovahs_witness", "description": "🄿 Kingdom Hall of Jehovah's Witnesses", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"},
+    {"key": "denomination", "value": "la_luz_del_mundo", "description": "🄿 La Luz del Mundo Church", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"},
+    {"key": "denomination", "value": "quaker", "description": "🄿 Quaker Friends Meeting House", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/place-of-worship-15.svg?sanitize=true"},
     {"key": "religion", "value": "hindu", "description": "🄿 Hindu Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/hinduism.svg?sanitize=true"},
     {"key": "religion", "value": "jewish", "description": "🄿 Jewish Synagogue", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-jewish-15.svg?sanitize=true"},
     {"key": "religion", "value": "muslim", "description": "🄿 Muslim Mosque", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-muslim-15.svg?sanitize=true"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a8241969c..84012271b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4912,6 +4912,18 @@
                     "name": "Christian Church",
                     "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
                 },
+                "amenity/place_of_worship/christian/jehovahs_witness": {
+                    "name": "Kingdom Hall of Jehovah's Witnesses",
+                    "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
+                },
+                "amenity/place_of_worship/christian/la_luz_del_mundo": {
+                    "name": "La Luz del Mundo Church",
+                    "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple,the light of the world church"
+                },
+                "amenity/place_of_worship/christian/quaker": {
+                    "name": "Quaker Friends Meeting House",
+                    "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
+                },
                 "amenity/place_of_worship/hindu": {
                     "name": "Hindu Temple",
                     "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple"
@@ -4922,7 +4934,7 @@
                 },
                 "amenity/place_of_worship/muslim": {
                     "name": "Muslim Mosque",
-                    "terms": "muslim"
+                    "terms": "islam,muslim"
                 },
                 "amenity/place_of_worship/shinto": {
                     "name": "Shinto Shrine",