From dc918150f93112c87761d43d7b5efb3393c91ac7 Mon Sep 17 00:00:00 2001
From: ivanPyrohivskyi <ivan.pirogovsky@gmail.com>
Date: Mon, 11 Aug 2025 19:38:43 +0300
Subject: [PATCH] Fix place of worship

---
 poi/poi_types.xml | 513 ++++++++++++++++++++++++++--------------------
 1 file changed, 294 insertions(+), 219 deletions(-)

diff --git a/poi/poi_types.xml b/poi/poi_types.xml
index 8626efe75e..35a4b34e70 100644
--- a/poi/poi_types.xml
+++ b/poi/poi_types.xml
@@ -3501,6 +3501,236 @@
 				<poi_additional name="via_ferrata_scale" tag="via_ferrata_scale" type="text"/>
 			</poi_type>
 		</poi_category>
+
+		<poi_category name="place_of_worship" top="true" excluded_poi_additional_category="fee,payment_type,wheelchair_accessibility,internet_access_type">
+			<poi_additional_category name="religion_type" icon="religion_christian">
+				<poi_additional name="religion_christian" tag="religion" value="christian" top="true"/>
+				<poi_additional name="religion_jewish" tag="religion" value="jewish" top="true"/>
+				<poi_additional name="religion_muslim" tag="religion" value="muslim" top="true"/>
+				<poi_additional name="religion_sikh" tag="religion" value="sikh"/>
+				<poi_additional name="religion_buddhist" tag="religion" value="buddhist"/>
+				<poi_additional name="religion_hindu" tag="religion" value="hindu" top="true"/>
+				<poi_additional name="religion_shinto" tag="religion" value="shinto"/>
+				<poi_additional name="religion_taoist" tag="religion" value="taoist"/>
+				<poi_additional name="religion_voodoo" tag="religion" value="voodoo"/>
+				<poi_additional name="religion_unitarian_universalist" tag="religion" value="unitarian_universalist"/>
+				<poi_additional name="religion_multifaith" tag="religion" value="multifaith"/>
+				<poi_additional name="religion_jain" tag="religion" value="jain"/>
+				<poi_additional name="religion_spiritualist" tag="religion" value="spiritualist"/>
+				<poi_additional name="religion_bahai" tag="religion" value="bahai"/>
+				<poi_additional name="religion_scientologist" tag="religion" value="scientologist"/>
+				<poi_additional name="religion_pagan" tag="religion" value="pagan"/>
+				<poi_additional name="religion_tenrikyo" tag="religion" value="tenrikyo"/>
+				<poi_additional name="religion_zoroastrian" tag="religion" value="zoroastrian"/>
+			</poi_additional_category>
+			<poi_additional_category name="denomination">
+				<poi_additional name="denomination_catholic" tag="denomination" value="catholic" top="true"/>
+				<poi_additional name="denomination_baptist" tag="denomination" value="baptist" top="true"/>
+				<poi_additional name="denomination_roman_catholic" tag="denomination" value="roman_catholic" top="true"/>
+				<poi_additional name="denomination_orthodox" tag="denomination" value="orthodox" top="true"/>
+				<poi_additional name="denomination_lutheran" tag="denomination" value="lutheran"/>
+				<poi_additional name="denomination_sunni" tag="denomination" value="sunni" top="true"/>
+				<poi_additional name="denomination_protestant" tag="denomination" value="protestant"/>
+				<poi_additional name="denomination_methodist" tag="denomination" value="methodist"/>
+				<poi_additional name="denomination_anglican" tag="denomination" value="anglican"/>
+				<poi_additional name="denomination_presbyterian" tag="denomination" value="presbyterian"/>
+				<poi_additional name="denomination_evangelical" tag="denomination" value="evangelical"/>
+				<poi_additional name="denomination_russian_orthodox" tag="denomination" value="russian_orthodox"/>
+				<poi_additional name="denomination_pentecostal" tag="denomination" value="pentecostal"/>
+				<poi_additional name="denomination_mormon" tag="denomination" value="mormon"/>
+				<poi_additional name="denomination_jehovahs_witness" tag="denomination" value="jehovahs_witness"/>
+				<poi_additional name="denomination_greek_orthodox" tag="denomination" value="greek_orthodox"/>
+				<poi_additional name="denomination_reformed" tag="denomination" value="reformed"/>
+				<poi_additional name="denomination_seventh_day_adventist" tag="denomination" value="seventh_day_adventist"/>
+				<poi_additional name="denomination_new_apostolic" tag="denomination" value="new_apostolic"/>
+				<poi_additional name="denomination_church_of_england" tag="denomination" value="church_of_england"/>
+				<poi_additional name="denomination_episcopal" tag="denomination" value="episcopal"/>
+				<poi_additional name="denomination_shia" tag="denomination" value="shia"/>
+				<poi_additional name="denomination_united" tag="denomination" value="united"/>
+				<poi_additional name="denomination_greek_catholic" tag="denomination" value="greek_catholic"/>
+				<poi_additional name="denomination_tibetan" tag="denomination" value="tibetan"/>
+				<poi_additional name="denomination_united_reformed" tag="denomination" value="united_reformed"/>
+				<poi_additional name="denomination_church_of_scotland" tag="denomination" value="church_of_scotland"/>
+				<poi_additional name="denomination_salvation_army" tag="denomination" value="salvation_army"/>
+				<poi_additional name="denomination_iglesia_ni_cristo" tag="denomination" value="iglesia_ni_cristo"/>
+				<poi_additional name="denomination_uniting" tag="denomination" value="uniting"/>
+				<poi_additional name="denomination_mennonite" tag="denomination" value="mennonite"/>
+				<poi_additional name="denomination_quaker" tag="denomination" value="quaker"/>
+				<poi_additional name="denomination_bulgarian_orthodox" tag="denomination" value="bulgarian_orthodox"/>
+				<poi_additional name="denomination_assemblies_of_god" tag="denomination" value="assemblies_of_god"/>
+				<poi_additional name="denomination_nondenominational" tag="denomination" value="nondenominational"/>
+				<poi_additional name="denomination_adventist" tag="denomination" value="adventist"/>
+				<poi_additional name="denomination_nazarene" tag="denomination" value="nazarene"/>
+				<poi_additional name="denomination_united_methodist" tag="denomination" value="united_methodist"/>
+				<poi_additional name="denomination_congregational" tag="denomination" value="congregational"/>
+				<poi_additional name="denomination_old_believers" tag="denomination" value="old_believers"/>
+				<poi_additional name="denomination_serbian_orthodox" tag="denomination" value="serbian_orthodox"/>
+				<poi_additional name="denomination_spiritist" tag="denomination" value="spiritist"/>
+				<poi_additional name="denomination_armenian_apostolic" tag="denomination" value="armenian_apostolic"/>
+				<poi_additional name="denomination_dutch_reformed" tag="denomination" value="dutch_reformed"/>
+				<poi_additional name="denomination_apostolic" tag="denomination" value="apostolic"/>
+				<poi_additional name="denomination_reform" tag="denomination" value="reform"/>
+				<poi_additional name="denomination_latter_day_saints" tag="denomination" value="latter_day_saints"/>
+				<poi_additional name="denomination_church_of_christ" tag="denomination" value="church_of_christ"/>
+				<poi_additional name="denomination_united_church_of_christ" tag="denomination" value="united_church_of_christ"/>
+				<poi_additional name="denomination_georgian_orthodox" tag="denomination" value="georgian_orthodox"/>
+				<poi_additional name="denomination_scientist" tag="denomination" value="scientist"/>
+				<poi_additional name="denomination_romanian_orthodox" tag="denomination" value="romanian_orthodox"/>
+				<poi_additional name="denomination_ethiopian_orthodox_tewahedo" tag="denomination" value="ethiopian_orthodox_tewahedo"/>
+				<poi_additional name="denomination_unitarian" tag="denomination" value="unitarian"/>
+				<poi_additional name="denomination_coptic_orthodox" tag="denomination" value="coptic_orthodox"/>
+				<poi_additional name="denomination_wesleyan" tag="denomination" value="wesleyan"/>
+				<poi_additional name="denomination_shaktism" tag="denomination" value="shaktism"/>
+				<poi_additional name="denomination_shingon_shu" tag="denomination" value="shingon_shu"/>
+				<poi_additional name="denomination_maronite" tag="denomination" value="maronite"/>
+				<poi_additional name="denomination_mahayana" tag="denomination" value="mahayana"/>
+				<poi_additional name="denomination_ukrainian_greek_catholic" tag="denomination" value="ukrainian_greek_catholic"/>
+				<poi_additional name="denomination_ukrainian_orthodox" tag="denomination" value="ukrainian_orthodox"/>
+				<poi_additional name="denomination_neo_pentecostal" tag="denomination" value="neo-pentecostal"/>
+				<poi_additional name="denomination_evangelical_lutheran" tag="denomination" value="evangelical_lutheran"/>
+				<poi_additional name="denomination_anabaptist" tag="denomination" value="anabaptist"/>
+				<poi_additional name="denomination_thai_mahanikaya" tag="denomination" value="thai_mahanikaya"/>
+				<poi_additional name="denomination_thai_thammayut" tag="denomination" value="thai_thammayut"/>
+				<poi_additional name="denomination_african_methodist_episcopal" tag="denomination" value="african_methodist_episcopal"/>
+				<poi_additional name="denomination_soto" tag="denomination" value="soto"/>
+				<poi_additional name="denomination_macedonian_orthodox" tag="denomination" value="macedonian_orthodox"/>
+				<poi_additional name="denomination_southern_baptist" tag="denomination" value="southern_baptist"/>
+				<poi_additional name="denomination_jodo_shinshu" tag="denomination" value="jodo_shinshu"/>
+				<poi_additional name="denomination_african_methodist_episcopal_zion" tag="denomination" value="african_methodist_episcopal_zion"/>
+				<poi_additional name="denomination_christ_scientist" tag="denomination" value="christ_scientist"/>
+				<poi_additional name="denomination_nichiren" tag="denomination" value="nichiren"/>
+				<poi_additional name="denomination_church_of_god" tag="denomination" value="church_of_god"/>
+				<poi_additional name="denomination_brethren" tag="denomination" value="brethren"/>
+				<poi_additional name="denomination_free_evangelical" tag="denomination" value="free_evangelical"/>
+				<poi_additional name="denomination_ahmadiyya" tag="denomination" value="ahmadiyya"/>
+				<poi_additional name="denomination_alevi" tag="denomination" value="alevi"/>
+				<poi_additional name="denomination_bektashi" tag="denomination" value="bektashi"/>
+				<poi_additional name="denomination_ibadi" tag="denomination" value="ibadi"/>
+				<poi_additional name="denomination_ismaili" tag="denomination" value="ismaili"/>
+				<poi_additional name="denomination_sufi" tag="denomination" value="sufi"/>
+				<poi_additional name="denomination_jodo_shu" tag="denomination" value="jodo_shu"/>
+				<poi_additional name="denomination_rinzai" tag="denomination" value="rinzai"/>
+				<poi_additional name="denomination_shaivism" tag="denomination" value="shaivism"/>
+				<poi_additional name="denomination_old_catholic" tag="denomination" value="old_catholic"/>
+				<poi_additional name="denomination_pkn" tag="denomination" value="pkn"/>
+				<poi_additional name="denomination_zen" tag="denomination" value="zen"/>
+				<poi_additional name="denomination_vaishnavism" tag="denomination" value="vaishnavism"/>
+				<poi_additional name="denomination_hare_krishna" tag="denomination" value="hare_krishna"/>
+				<poi_additional name="denomination_foursquare" tag="denomination" value="foursquare"/>
+				<poi_additional name="denomination_conservative" tag="denomination" value="conservative"/>
+				<poi_additional name="denomination_ashkenazi" tag="denomination" value="ashkenazi"/>
+				<poi_additional name="denomination_hasidic" tag="denomination" value="hasidic"/>
+				<poi_additional name="denomination_lubavitch" tag="denomination" value="lubavitch"/>
+				<poi_additional name="denomination_theravada" tag="denomination" value="theravada"/>
+				<poi_additional name="denomination_tiantai" tag="denomination" value="tiantai"/>
+				<poi_additional name="denomination_scottish_episcopal" tag="denomination" value="scottish_episcopal"/>
+				<poi_additional name="denomination_polish_catholic" tag="denomination" value="polish_catholic"/>
+				<poi_additional name="denomination_moravian" tag="denomination" value="moravian"/>
+				<poi_additional name="denomination_disciples_of_christ" tag="denomination" value="disciples_of_christ"/>
+				<poi_additional name="denomination_charismatic" tag="denomination" value="charismatic"/>
+				<poi_additional name="denomination_ecumenical" tag="denomination" value="ecumenical"/>
+				<poi_additional name="denomination_fsspx" tag="denomination" value="fsspx"/>
+				<poi_additional name="denomination_syriac_orthodox" tag="denomination" value="syriac_orthodox"/>
+				<poi_additional name="denomination_laestadian" tag="denomination" value="laestadian"/>
+				<poi_additional name="denomination_philippine_independent" tag="denomination" value="philippine_independent"/>
+				<poi_additional name="denomination_exclusive_brethren" tag="denomination" value="exclusive_brethren"/>
+				<poi_additional name="denomination_church_of_god_in_christ" tag="denomination" value="church_of_god_in_christ"/>
+				<poi_additional name="denomination_czechoslovak_hussite" tag="denomination" value="czechoslovak_hussite"/>
+				<poi_additional name="denomination_la_luz_del_mundo" tag="denomination" value="la_luz_del_mundo"/>
+				<poi_additional name="denomination_christadelphian" tag="denomination" value="christadelphian"/>
+				<poi_additional name="denomination_eritrean_orthodox" tag="denomination" value="eritrean_orthodox"/>
+				<poi_additional name="denomination_antiochian_orthodox" tag="denomination" value="antiochian_orthodox"/>
+				<poi_additional name="denomination_mariavite" tag="denomination" value="mariavite"/>
+				<poi_additional name="denomination_mission_covenant_church_of_sweden" tag="denomination" value="mission_covenant_church_of_sweden"/>
+				<poi_additional name="denomination_gelug" tag="denomination" value="gelug"/>
+				<poi_additional name="denomination_vajrayana" tag="denomination" value="vajrayana"/>
+				<poi_additional name="denomination_slavic" tag="denomination" value="slavic"/>
+				<poi_additional name="denomination_celtic" tag="denomination" value="celtic"/>
+				<poi_additional name="denomination_marthoma" tag="denomination" value="marthoma"/>
+				<poi_additional name="denomination_free_methodist" tag="denomination" value="free_methodist"/>
+				<poi_additional name="denomination_churches_of_christ" tag="denomination" value="churches_of_christ"/>
+				<poi_additional name="denomination_kardecista" tag="denomination" value="kardecista"/>
+				<poi_additional name="denomination_free_church_of_scotland" tag="denomination" value="free_church_of_scotland"/>
+				<poi_additional name="denomination_catholic_apostolic" tag="denomination" value="catholic_apostolic"/>
+				<poi_additional name="denomination_sephardi" tag="denomination" value="sephardi"/>
+				<poi_additional name="denomination_welsh_independent" tag="denomination" value="welsh_independent"/>
+			</poi_additional_category>
+			<poi_filter name="christianity" excluded_poi_additional_category="fee,internet_access_type,payment_type">
+				<poi_type name="jehovahs_witness_kingdom_hall" tag="building" value="jehovahs_witness_kingdom_hall" icon="building_type_church" no_edit="true"/>
+				<poi_type name="catholic_church" tag="building" value="catholic_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="roman_catholic_church" tag="building" value="roman_catholic_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="baptist_church" tag="building" value="baptist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="lutheran_church" tag="building" value="lutheran_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="orthodox_church" tag="building" value="orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="protestant_church" tag="building" value="protestant_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="anglican_church" tag="building" value="anglican_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="methodist_church" tag="building" value="methodist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="greek_orthodox_church" tag="building" value="greek_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="russian_orthodox_church" tag="building" value="russian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="pentecostal_church" tag="building" value="pentecostal_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="evangelical_church" tag="building" value="evangelical_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="presbyterian_church" tag="building" value="presbyterian_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="mormon_church" tag="building" value="mormon_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="seventh_day_adventist_church" tag="building" value="seventh_day_adventist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="reformed_church" tag="building" value="reformed_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="ethiopian_orthodox_church" tag="building" value="ethiopian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="romanian_orthodox_church" tag="building" value="romanian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="serbian_orthodox_church" tag="building" value="serbian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="greek_catholic_church" tag="building" value="greek_catholic_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="united_methodist_church" tag="building" value="united_methodist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="ukrainian_greek_catholic_church" tag="building" value="ukrainian_greek_catholic_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="episcopal_church" tag="building" value="episcopal_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="iglesia_ni_cristo_church" tag="building" value="iglesia_ni_cristo_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="nondenominational_church" tag="building" value="nondenominational_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="georgian_orthodox_church" tag="building" value="georgian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="new_apostolic_church" tag="building" value="new_apostolic_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="ukrainian_orthodox_church" tag="building" value="ukrainian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="united_church" tag="building" value="united_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="assemblies_of_god_church" tag="building" value="assemblies_of_god_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="church_of_scotland" tag="building" value="church_of_scotland" icon="building_type_church" no_edit="true"/>
+				<poi_type name="salvation_army_church" tag="building" value="salvation_army_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="armenian_apostolic_church" tag="building" value="armenian_apostolic_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="quaker_church" tag="building" value="quaker_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="church_of_christ" tag="building" value="church_of_christ" icon="building_type_church" no_edit="true"/>
+				<poi_type name="neo_pentecostal_church" tag="building" value="neo-pentecostal_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="latter_day_saints_church" tag="building" value="latter_day_saints_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="evangelical_lutheran_church" tag="building" value="evangelical_lutheran_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="mennonite_church" tag="building" value="mennonite_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="adventist_church" tag="building" value="adventist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="uniting_church" tag="building" value="uniting_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="apostolic_church" tag="building" value="apostolic_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="united_church_of_christ" tag="building" value="united_church_of_christ" icon="building_type_church" no_edit="true"/>
+				<poi_type name="united_reformed_church" tag="building" value="united_reformed_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="anabaptist_church" tag="building" value="anabaptist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="bulgarian_orthodox_church" tag="building" value="bulgarian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="african_methodist_episcopal_church" tag="building" value="african_methodist_episcopal_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="macedonian_orthodox_church" tag="building" value="macedonian_orthodox_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="southern_baptist_church" tag="building" value="southern_baptist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="congregational_church" tag="building" value="congregational_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="spiritist_church" tag="building" value="spiritist_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="church" tag="building" value="christian_church" icon="building_type_church" no_edit="true"/>
+				<poi_type name="chapel" tag="building" value="chapel" icon="building_type_church" no_edit="true"/>
+				<poi_type name="cathedral" tag="building" value="cathedral" icon="building_type_church" no_edit="true"/>
+				<poi_type name="monastery" tag="amenity" value="monastery" icon="building_type_church" excluded_poi_additional_category="fee,payment_type,internet_access_type">
+					<poi_additional name="monastery_type_convent" tag="monastery:type" value="convent"/>
+					<poi_additional name="monastery_type_canonry" tag="monastery:type" value="canonry"/>
+					<poi_additional name="monastery_type_hermitage" tag="monastery:type" value="hermitage"/>
+					<poi_additional name="monastery_type_clerks_regular" tag="monastery:type" value="clerks_regular"/>
+				</poi_type>
+				<poi_type name="basilica" tag="building" value="basilica" icon="building_type_church" no_edit="true"/>
+			</poi_filter>
+			<poi_filter name="islam" excluded_poi_additional_category="fee,internet_access_type,payment_type">
+				<poi_type name="mosque" tag="building" value="mosque" icon="building_type_mosque" no_edit="true"/>
+			</poi_filter>
+			<poi_filter name="buddhism" excluded_poi_additional_category="fee,internet_access_type,payment_type">
+				<poi_type name="buddhist_temple" tag="building" value="buddhist_temple" icon="religion_buddhist" no_edit="true"/>
+			</poi_filter>
+			<poi_type name="hindu_temple" tag="building" value="hindu_temple" icon="religion_hindu" no_edit="true"/>
+			<poi_type name="shinto_shrine" tag="building" value="shinto_shrine" icon="religion_shinto" no_edit="true"/>
+			<poi_type name="synagogue" tag="building" value="synagogue" icon="building_type_synagogue" no_edit="true"/>
+			<poi_type name="place_of_worship_other" tag="amenity" value="place_of_worship" excluded_poi_additional_category="internet_access_type,payment_type,fee" />
+		</poi_category>
+
 		<poi_category name="tourism" default_tag="tourism" top="true">
 			<poi_filter name="sightseeing" top="true">
 				<poi_type name="museum" tag="tourism" value="museum">
@@ -3573,12 +3803,7 @@
 					<poi_additional name="fortification_type_ring_ditch" tag="fortification_type" value="ring_ditch"/>
 				</poi_type>
 				<poi_type name="pa" tag="historic" value="pa" excluded_poi_additional_category="internet_access_type,payment_type"/>
-				<poi_type name="monastery" tag="amenity" value="monastery" excluded_poi_additional_category="fee,payment_type,internet_access_type">
-					<poi_additional name="monastery_type_convent" tag="monastery:type" value="convent"/>
-					<poi_additional name="monastery_type_canonry" tag="monastery:type" value="canonry"/>
-					<poi_additional name="monastery_type_hermitage" tag="monastery:type" value="hermitage"/>
-					<poi_additional name="monastery_type_clerks_regular" tag="monastery:type" value="clerks_regular"/>
-				</poi_type>
+				<poi_reference name="monastery" />
 				<poi_type name="palaeontological_site" tag="geological" value="palaeontological_site" excluded_poi_additional_category="internet_access_type,payment_type,opening_hours"/>
 				<poi_type name="outcrop" tag="geological" value="outcrop" excluded_poi_additional_category="internet_access_type,payment_type,opening_hours"/>
 				<poi_type name="battlefield" tag="historic" value="battlefield" excluded_poi_additional_category="internet_access_type,payment_type,fee,opening_hours"/>
@@ -3682,218 +3907,69 @@
 				<poi_type name="cabin" tag="tourism" value="cabin" excluded_poi_additional_category="payment_type"/>
 				<poi_type name="hunting_lodge" tag="tourism" value="hunting_lodge" excluded_poi_additional_category="payment_type,opening_hours"/>
 			</poi_filter>
-			<poi_type name="mosque" tag="building" value="mosque" icon="building_type_mosque" no_edit="true"/>
-			<poi_type name="buddhist_temple" tag="building" value="buddhist_temple" icon="religion_buddhist" no_edit="true"/>
-			<poi_type name="hindu_temple" tag="building" value="hindu_temple" icon="religion_hindu" no_edit="true"/>
-			<poi_type name="shinto_shrine" tag="building" value="shinto_shrine" icon="religion_shinto" no_edit="true"/>
-			<poi_type name="synagogue" tag="building" value="synagogue" icon="building_type_synagogue" no_edit="true"/>
-			<poi_type name="jehovahs_witness_kingdom_hall" tag="building" value="jehovahs_witness_kingdom_hall" icon="building_type_church" no_edit="true"/>
-			<poi_type name="catholic_church" tag="building" value="catholic_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="roman_catholic_church" tag="building" value="roman_catholic_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="baptist_church" tag="building" value="baptist_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="lutheran_church" tag="building" value="lutheran_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="orthodox_church" tag="building" value="orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="protestant_church" tag="building" value="protestant_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="anglican_church" tag="building" value="anglican_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="methodist_church" tag="building" value="methodist_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="greek_orthodox_church" tag="building" value="greek_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="russian_orthodox_church" tag="building" value="russian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="pentecostal_church" tag="building" value="pentecostal_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="evangelical_church" tag="building" value="evangelical_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="presbyterian_church" tag="building" value="presbyterian_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="mormon_church" tag="building" value="mormon_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="seventh_day_adventist_church" tag="building" value="seventh_day_adventist_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="reformed_church" tag="building" value="reformed_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="ethiopian_orthodox_church" tag="building" value="ethiopian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="romanian_orthodox_church" tag="building" value="romanian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="serbian_orthodox_church" tag="building" value="serbian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="greek_catholic_church" tag="building" value="greek_catholic_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="united_methodist_church" tag="building" value="united_methodist_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="ukrainian_greek_catholic_church" tag="building" value="ukrainian_greek_catholic_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="episcopal_church" tag="building" value="episcopal_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="iglesia_ni_cristo_church" tag="building" value="iglesia_ni_cristo_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="nondenominational_church" tag="building" value="nondenominational_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="georgian_orthodox_church" tag="building" value="georgian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="new_apostolic_church" tag="building" value="new_apostolic_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="ukrainian_orthodox_church" tag="building" value="ukrainian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="united_church" tag="building" value="united_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="assemblies_of_god_church" tag="building" value="assemblies_of_god_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="church_of_scotland" tag="building" value="church_of_scotland" icon="building_type_church" no_edit="true"/>
-			<poi_type name="salvation_army_church" tag="building" value="salvation_army_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="armenian_apostolic_church" tag="building" value="armenian_apostolic_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="quaker_church" tag="building" value="quaker_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="church_of_christ" tag="building" value="church_of_christ" icon="building_type_church" no_edit="true"/>
-			<poi_type name="neo_pentecostal_church" tag="building" value="neo-pentecostal_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="latter_day_saints_church" tag="building" value="latter_day_saints_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="evangelical_lutheran_church" tag="building" value="evangelical_lutheran_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="mennonite_church" tag="building" value="mennonite_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="adventist_church" tag="building" value="adventist_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="uniting_church" tag="building" value="uniting_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="apostolic_church" tag="building" value="apostolic_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="united_church_of_christ" tag="building" value="united_church_of_christ" icon="building_type_church" no_edit="true"/>
-			<poi_type name="united_reformed_church" tag="building" value="united_reformed_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="anabaptist_church" tag="building" value="anabaptist_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="bulgarian_orthodox_church" tag="building" value="bulgarian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="african_methodist_episcopal_church" tag="building" value="african_methodist_episcopal_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="macedonian_orthodox_church" tag="building" value="macedonian_orthodox_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="southern_baptist_church" tag="building" value="southern_baptist_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="congregational_church" tag="building" value="congregational_church" icon="building_type_church" no_edit="true"/>
-			<poi_type name="spiritist_church" tag="building" value="spiritist_church" icon="building_type_church" no_edit="true"/>
-
-			<poi_type name="place_of_worship" tag="amenity" value="place_of_worship" excluded_poi_additional_category="internet_access_type,payment_type,fee">
-				<poi_additional_category name="religion_type" icon="religion_christian">
-					<poi_additional name="religion_christian" tag="religion" value="christian" top="true"/>
-					<poi_additional name="religion_jewish" tag="religion" value="jewish" top="true"/>
-					<poi_additional name="religion_muslim" tag="religion" value="muslim" top="true"/>
-					<poi_additional name="religion_sikh" tag="religion" value="sikh"/>
-					<poi_additional name="religion_buddhist" tag="religion" value="buddhist"/>
-					<poi_additional name="religion_hindu" tag="religion" value="hindu" top="true"/>
-					<poi_additional name="religion_shinto" tag="religion" value="shinto"/>
-					<poi_additional name="religion_taoist" tag="religion" value="taoist"/>
-					<poi_additional name="religion_voodoo" tag="religion" value="voodoo"/>
-					<poi_additional name="religion_unitarian_universalist" tag="religion" value="unitarian_universalist"/>
-					<poi_additional name="religion_multifaith" tag="religion" value="multifaith"/>
-					<poi_additional name="religion_jain" tag="religion" value="jain"/>
-					<poi_additional name="religion_spiritualist" tag="religion" value="spiritualist"/>
-					<poi_additional name="religion_bahai" tag="religion" value="bahai"/>
-					<poi_additional name="religion_scientologist" tag="religion" value="scientologist"/>
-					<poi_additional name="religion_pagan" tag="religion" value="pagan"/>
-					<poi_additional name="religion_tenrikyo" tag="religion" value="tenrikyo"/>
-					<poi_additional name="religion_zoroastrian" tag="religion" value="zoroastrian"/>
-				</poi_additional_category>
-				<poi_additional_category name="denomination">
-					<poi_additional name="denomination_catholic" tag="denomination" value="catholic" top="true"/>
-					<poi_additional name="denomination_baptist" tag="denomination" value="baptist" top="true"/>
-					<poi_additional name="denomination_roman_catholic" tag="denomination" value="roman_catholic" top="true"/>
-					<poi_additional name="denomination_orthodox" tag="denomination" value="orthodox" top="true"/>
-					<poi_additional name="denomination_lutheran" tag="denomination" value="lutheran"/>
-					<poi_additional name="denomination_sunni" tag="denomination" value="sunni" top="true"/>
-					<poi_additional name="denomination_protestant" tag="denomination" value="protestant"/>
-					<poi_additional name="denomination_methodist" tag="denomination" value="methodist"/>
-					<poi_additional name="denomination_anglican" tag="denomination" value="anglican"/>
-					<poi_additional name="denomination_presbyterian" tag="denomination" value="presbyterian"/>
-					<poi_additional name="denomination_evangelical" tag="denomination" value="evangelical"/>
-					<poi_additional name="denomination_russian_orthodox" tag="denomination" value="russian_orthodox"/>
-					<poi_additional name="denomination_pentecostal" tag="denomination" value="pentecostal"/>
-					<poi_additional name="denomination_mormon" tag="denomination" value="mormon"/>
-					<poi_additional name="denomination_jehovahs_witness" tag="denomination" value="jehovahs_witness"/>
-					<poi_additional name="denomination_greek_orthodox" tag="denomination" value="greek_orthodox"/>
-					<poi_additional name="denomination_reformed" tag="denomination" value="reformed"/>
-					<poi_additional name="denomination_seventh_day_adventist" tag="denomination" value="seventh_day_adventist"/>
-					<poi_additional name="denomination_new_apostolic" tag="denomination" value="new_apostolic"/>
-					<poi_additional name="denomination_church_of_england" tag="denomination" value="church_of_england"/>
-					<poi_additional name="denomination_episcopal" tag="denomination" value="episcopal"/>
-					<poi_additional name="denomination_shia" tag="denomination" value="shia"/>
-					<poi_additional name="denomination_united" tag="denomination" value="united"/>
-					<poi_additional name="denomination_greek_catholic" tag="denomination" value="greek_catholic"/>
-					<poi_additional name="denomination_tibetan" tag="denomination" value="tibetan"/>
-					<poi_additional name="denomination_united_reformed" tag="denomination" value="united_reformed"/>
-					<poi_additional name="denomination_church_of_scotland" tag="denomination" value="church_of_scotland"/>
-					<poi_additional name="denomination_salvation_army" tag="denomination" value="salvation_army"/>
-					<poi_additional name="denomination_iglesia_ni_cristo" tag="denomination" value="iglesia_ni_cristo"/>
-					<poi_additional name="denomination_uniting" tag="denomination" value="uniting"/>
-					<poi_additional name="denomination_mennonite" tag="denomination" value="mennonite"/>
-					<poi_additional name="denomination_quaker" tag="denomination" value="quaker"/>
-					<poi_additional name="denomination_bulgarian_orthodox" tag="denomination" value="bulgarian_orthodox"/>
-					<poi_additional name="denomination_assemblies_of_god" tag="denomination" value="assemblies_of_god"/>
-					<poi_additional name="denomination_nondenominational" tag="denomination" value="nondenominational"/>
-					<poi_additional name="denomination_adventist" tag="denomination" value="adventist"/>
-					<poi_additional name="denomination_nazarene" tag="denomination" value="nazarene"/>
-					<poi_additional name="denomination_united_methodist" tag="denomination" value="united_methodist"/>
-					<poi_additional name="denomination_congregational" tag="denomination" value="congregational"/>
-					<poi_additional name="denomination_old_believers" tag="denomination" value="old_believers"/>
-					<poi_additional name="denomination_serbian_orthodox" tag="denomination" value="serbian_orthodox"/>
-					<poi_additional name="denomination_spiritist" tag="denomination" value="spiritist"/>
-					<poi_additional name="denomination_armenian_apostolic" tag="denomination" value="armenian_apostolic"/>
-					<poi_additional name="denomination_dutch_reformed" tag="denomination" value="dutch_reformed"/>
-					<poi_additional name="denomination_apostolic" tag="denomination" value="apostolic"/>
-					<poi_additional name="denomination_reform" tag="denomination" value="reform"/>
-					<poi_additional name="denomination_latter_day_saints" tag="denomination" value="latter_day_saints"/>
-					<poi_additional name="denomination_church_of_christ" tag="denomination" value="church_of_christ"/>
-					<poi_additional name="denomination_united_church_of_christ" tag="denomination" value="united_church_of_christ"/>
-					<poi_additional name="denomination_georgian_orthodox" tag="denomination" value="georgian_orthodox"/>
-					<poi_additional name="denomination_scientist" tag="denomination" value="scientist"/>
-					<poi_additional name="denomination_romanian_orthodox" tag="denomination" value="romanian_orthodox"/>
-					<poi_additional name="denomination_ethiopian_orthodox_tewahedo" tag="denomination" value="ethiopian_orthodox_tewahedo"/>
-					<poi_additional name="denomination_unitarian" tag="denomination" value="unitarian"/>
-					<poi_additional name="denomination_coptic_orthodox" tag="denomination" value="coptic_orthodox"/>
-					<poi_additional name="denomination_wesleyan" tag="denomination" value="wesleyan"/>
-					<poi_additional name="denomination_shaktism" tag="denomination" value="shaktism"/>
-					<poi_additional name="denomination_shingon_shu" tag="denomination" value="shingon_shu"/>
-					<poi_additional name="denomination_maronite" tag="denomination" value="maronite"/>
-					<poi_additional name="denomination_mahayana" tag="denomination" value="mahayana"/>
-					<poi_additional name="denomination_ukrainian_greek_catholic" tag="denomination" value="ukrainian_greek_catholic"/>
-					<poi_additional name="denomination_ukrainian_orthodox" tag="denomination" value="ukrainian_orthodox"/>
-					<poi_additional name="denomination_neo_pentecostal" tag="denomination" value="neo-pentecostal"/>
-					<poi_additional name="denomination_evangelical_lutheran" tag="denomination" value="evangelical_lutheran"/>
-					<poi_additional name="denomination_anabaptist" tag="denomination" value="anabaptist"/>
-					<poi_additional name="denomination_thai_mahanikaya" tag="denomination" value="thai_mahanikaya"/>
-					<poi_additional name="denomination_thai_thammayut" tag="denomination" value="thai_thammayut"/>
-					<poi_additional name="denomination_african_methodist_episcopal" tag="denomination" value="african_methodist_episcopal"/>
-					<poi_additional name="denomination_soto" tag="denomination" value="soto"/>
-					<poi_additional name="denomination_macedonian_orthodox" tag="denomination" value="macedonian_orthodox"/>
-					<poi_additional name="denomination_southern_baptist" tag="denomination" value="southern_baptist"/>
-					<poi_additional name="denomination_jodo_shinshu" tag="denomination" value="jodo_shinshu"/>
-					<poi_additional name="denomination_african_methodist_episcopal_zion" tag="denomination" value="african_methodist_episcopal_zion"/>
-					<poi_additional name="denomination_christ_scientist" tag="denomination" value="christ_scientist"/>
-					<poi_additional name="denomination_nichiren" tag="denomination" value="nichiren"/>
-					<poi_additional name="denomination_church_of_god" tag="denomination" value="church_of_god"/>
-					<poi_additional name="denomination_brethren" tag="denomination" value="brethren"/>
-					<poi_additional name="denomination_free_evangelical" tag="denomination" value="free_evangelical"/>
-					<poi_additional name="denomination_ahmadiyya" tag="denomination" value="ahmadiyya"/>
-					<poi_additional name="denomination_alevi" tag="denomination" value="alevi"/>
-					<poi_additional name="denomination_bektashi" tag="denomination" value="bektashi"/>
-					<poi_additional name="denomination_ibadi" tag="denomination" value="ibadi"/>
-					<poi_additional name="denomination_ismaili" tag="denomination" value="ismaili"/>
-					<poi_additional name="denomination_sufi" tag="denomination" value="sufi"/>
-					<poi_additional name="denomination_jodo_shu" tag="denomination" value="jodo_shu"/>
-					<poi_additional name="denomination_rinzai" tag="denomination" value="rinzai"/>
-					<poi_additional name="denomination_shaivism" tag="denomination" value="shaivism"/>
-					<poi_additional name="denomination_old_catholic" tag="denomination" value="old_catholic"/>
-					<poi_additional name="denomination_pkn" tag="denomination" value="pkn"/>
-					<poi_additional name="denomination_zen" tag="denomination" value="zen"/>
-					<poi_additional name="denomination_vaishnavism" tag="denomination" value="vaishnavism"/>
-					<poi_additional name="denomination_hare_krishna" tag="denomination" value="hare_krishna"/>
-					<poi_additional name="denomination_foursquare" tag="denomination" value="foursquare"/>
-					<poi_additional name="denomination_conservative" tag="denomination" value="conservative"/>
-					<poi_additional name="denomination_ashkenazi" tag="denomination" value="ashkenazi"/>
-					<poi_additional name="denomination_hasidic" tag="denomination" value="hasidic"/>
-					<poi_additional name="denomination_lubavitch" tag="denomination" value="lubavitch"/>
-					<poi_additional name="denomination_theravada" tag="denomination" value="theravada"/>
-					<poi_additional name="denomination_tiantai" tag="denomination" value="tiantai"/>
-					<poi_additional name="denomination_scottish_episcopal" tag="denomination" value="scottish_episcopal"/>
-					<poi_additional name="denomination_polish_catholic" tag="denomination" value="polish_catholic"/>
-					<poi_additional name="denomination_moravian" tag="denomination" value="moravian"/>
-					<poi_additional name="denomination_disciples_of_christ" tag="denomination" value="disciples_of_christ"/>
-					<poi_additional name="denomination_charismatic" tag="denomination" value="charismatic"/>
-					<poi_additional name="denomination_ecumenical" tag="denomination" value="ecumenical"/>
-					<poi_additional name="denomination_fsspx" tag="denomination" value="fsspx"/>
-					<poi_additional name="denomination_syriac_orthodox" tag="denomination" value="syriac_orthodox"/>
-					<poi_additional name="denomination_laestadian" tag="denomination" value="laestadian"/>
-					<poi_additional name="denomination_philippine_independent" tag="denomination" value="philippine_independent"/>
-					<poi_additional name="denomination_exclusive_brethren" tag="denomination" value="exclusive_brethren"/>
-					<poi_additional name="denomination_church_of_god_in_christ" tag="denomination" value="church_of_god_in_christ"/>
-					<poi_additional name="denomination_czechoslovak_hussite" tag="denomination" value="czechoslovak_hussite"/>
-					<poi_additional name="denomination_la_luz_del_mundo" tag="denomination" value="la_luz_del_mundo"/>
-					<poi_additional name="denomination_christadelphian" tag="denomination" value="christadelphian"/>
-					<poi_additional name="denomination_eritrean_orthodox" tag="denomination" value="eritrean_orthodox"/>
-					<poi_additional name="denomination_antiochian_orthodox" tag="denomination" value="antiochian_orthodox"/>
-					<poi_additional name="denomination_mariavite" tag="denomination" value="mariavite"/>
-					<poi_additional name="denomination_mission_covenant_church_of_sweden" tag="denomination" value="mission_covenant_church_of_sweden"/>
-					<poi_additional name="denomination_gelug" tag="denomination" value="gelug"/>
-					<poi_additional name="denomination_vajrayana" tag="denomination" value="vajrayana"/>
-					<poi_additional name="denomination_slavic" tag="denomination" value="slavic"/>
-					<poi_additional name="denomination_celtic" tag="denomination" value="celtic"/>
-					<poi_additional name="denomination_marthoma" tag="denomination" value="marthoma"/>
-					<poi_additional name="denomination_free_methodist" tag="denomination" value="free_methodist"/>
-					<poi_additional name="denomination_churches_of_christ" tag="denomination" value="churches_of_christ"/>
-					<poi_additional name="denomination_kardecista" tag="denomination" value="kardecista"/>
-					<poi_additional name="denomination_free_church_of_scotland" tag="denomination" value="free_church_of_scotland"/>
-					<poi_additional name="denomination_catholic_apostolic" tag="denomination" value="catholic_apostolic"/>
-					<poi_additional name="denomination_sephardi" tag="denomination" value="sephardi"/>
-					<poi_additional name="denomination_welsh_independent" tag="denomination" value="welsh_independent"/>
-				</poi_additional_category>
-			</poi_type>
+			<poi_reference name="jehovahs_witness_kingdom_hall" />
+			<poi_reference name="catholic_church" />
+			<poi_reference name="roman_catholic_church" />
+			<poi_reference name="baptist_church" />
+			<poi_reference name="lutheran_church" />
+			<poi_reference name="orthodox_church" />
+			<poi_reference name="protestant_church" />
+			<poi_reference name="anglican_church" />
+			<poi_reference name="methodist_church" />
+			<poi_reference name="greek_orthodox_church" />
+			<poi_reference name="russian_orthodox_church" />
+			<poi_reference name="pentecostal_church" />
+			<poi_reference name="evangelical_church" />
+			<poi_reference name="presbyterian_church" />
+			<poi_reference name="mormon_church" />
+			<poi_reference name="seventh_day_adventist_church" />
+			<poi_reference name="reformed_church" />
+			<poi_reference name="ethiopian_orthodox_church" />
+			<poi_reference name="romanian_orthodox_church" />
+			<poi_reference name="serbian_orthodox_church" />
+			<poi_reference name="greek_catholic_church" />
+			<poi_reference name="united_methodist_church" />
+			<poi_reference name="ukrainian_greek_catholic_church" />
+			<poi_reference name="episcopal_church" />
+			<poi_reference name="iglesia_ni_cristo_church" />
+			<poi_reference name="nondenominational_church" />
+			<poi_reference name="georgian_orthodox_church" />
+			<poi_reference name="new_apostolic_church" />
+			<poi_reference name="ukrainian_orthodox_church" />
+			<poi_reference name="united_church" />
+			<poi_reference name="assemblies_of_god_church" />
+			<poi_reference name="church_of_scotland" />
+			<poi_reference name="salvation_army_church" />
+			<poi_reference name="armenian_apostolic_church" />
+			<poi_reference name="quaker_church" />
+			<poi_reference name="church_of_christ" />
+			<poi_reference name="neo_pentecostal_church" />
+			<poi_reference name="latter_day_saints_church" />
+			<poi_reference name="evangelical_lutheran_church" />
+			<poi_reference name="mennonite_church" />
+			<poi_reference name="adventist_church" />
+			<poi_reference name="uniting_church" />
+			<poi_reference name="apostolic_church" />
+			<poi_reference name="united_church_of_christ" />
+			<poi_reference name="united_reformed_church" />
+			<poi_reference name="anabaptist_church" />
+			<poi_reference name="bulgarian_orthodox_church" />
+			<poi_reference name="african_methodist_episcopal_church" />
+			<poi_reference name="macedonian_orthodox_church" />
+			<poi_reference name="southern_baptist_church" />
+			<poi_reference name="congregational_church" />
+			<poi_reference name="spiritist_church" />
+			<poi_reference name="church" />
+			<poi_reference name="chapel" />
+			<poi_reference name="cathedral" />
+			<poi_reference name="monastery" />
+			<poi_reference name="basilica" />
+			<poi_reference name="mosque" />
+			<poi_reference name="buddhist_temple" />
+			<poi_reference name="hindu_temple" />
+			<poi_reference name="shinto_shrine" />
+			<poi_reference name="synagogue" />
+			<poi_reference name="place_of_worship_other" />
 			<poi_type name="hanami" tag="tourism" value="hanami" excluded_poi_additional_category="fee,payment_type,wheelchair_accessibility,internet_access_type,opening_hours"/>
 			<poi_reference name="religious"/>
 			<poi_type name="boundary_stone" tag="historic" value="boundary_stone" excluded_poi_additional_category="fee,payment_type,wheelchair_accessibility,internet_access_type,opening_hours"/>
@@ -5649,7 +5725,6 @@
 		<poi_type name="toll_gantry" tag="highway" value="toll_gantry"/>
 		<poi_type name="railway_crossing" tag="railway" value="crossing" no_edit="true"/>
 		<poi_type name="street_lamp" tag="highway" value="street_lamp"/>
-		<poi_type name="christian_church" tag="building" value="christian_church" icon="building_type_church" no_edit="true"/>
 
 		<!--		<poi_type name="deadlock" tag="noexit" value="yes" no_edit="true"/>-->
 		<poi_type name="osm_note_yes" tag="osm_note" value="yes" no_edit="true"/>