Index: trunk/data/ignoretags.cfg
===================================================================
--- trunk/data/ignoretags.cfg	(revision 5436)
+++ trunk/data/ignoretags.cfg	(revision 5475)
@@ -220,67 +220,79 @@
 K:relation=from
 ;
-; Religious Key/Value Pairs
-;
-T:religion=christian|denomination=anglican
-T:religion=muslim|denomination=alaouite
-T:religion=jewish|denomination=alternative
-T:religion=christian|denomination=apostolic
-T:religion=jewish|denomination=ashkenazi
-T:religion=christian|denomination=baptist
-T:religion=christian|denomination=catholic
-T:religion=christian|denomination=christian_community
-T:religion=christian|denomination=christian_scientist
-T:religion=jewish|denomination=conservative
-T:religion=christian|denomination=coptic_orthodox
-T:religion=christian|denomination=czechoslovak_hussite
-T:religion=muslim|denomination=druze
-T:religion=christian|denomination=dutch_reformed
-T:religion=christian|denomination=evangelical
-T:religion=pastafarian|denomination=EVKdFSMiD
-T:religion=christian|denomination=foursquare
-T:religion=christian|denomination=greek_orthodox
-T:religion=jewish|denomination=hasidic
-T:religion=jewish|denomination=humanistic
-T:religion=muslim|denomination=ibadi
-T:religion=muslim|denomination=ismaili
-T:religion=christian|denomination=jehovahs_witness
-T:religion=christian|denomination=kabbalah
-T:religion=christian|denomination=karaite
-T:religion=jewish|denomination=liberal
-T:religion=christian|denomination=living_waters_church
-T:religion=christian|denomination=lutheran
-T:religion=christian|denomination=maronite
-T:religion=other|denomination=masonic
-T:religion=christian|denomination=mennonite
-T:religion=christian|denomination=methodist
-T:religion=jewish|denomination=modern_orthodox
-T:religion=christian|denomination=mormon
-T:religion=jewish|denomination=neo_orthodox
-T:religion=christian|denomination=new_apostolic
-T:religion=christian|denomination=nondenominational
-T:religion=jewish|denomination=nondenominational
-T:religion=muslim|denomination=nondenominational
-T:religion=christian|denomination=old_catholic
-T:religion=christian|denomination=orthodox
-T:religion=jewish|denomination=orthodox
-T:religion=christian|denomination=pentecostal
-T:religion=christian|denomination=presbyterian
-T:religion=jewish|denomination=progressive
-T:religion=christian|denomination=protestant
-T:religion=christian|denomination=quaker
-T:religion=jewish|denomination=reconstructionist
-T:religion=jewish|denomination=reform
-T:religion=jewish|denomination=renewal
-T:religion=christian|denomination=roman_catholic
-T:religion=christian|denomination=russian_orthodox
-T:religion=christian|denomination=salvation_army
-T:religion=jewish|denomination=samaritan
-T:religion=christian|denomination=seventh_day_adventist
-T:religion=muslim|denomination=shia
-T:religion=muslim|denomination=sunni
-T:religion=jewish|denomination=ultra_orthodox
-T:religion=christian|denomination=united
-T:religion=christian|denomination=united_reformed
-T:religion=christian|denomination=uniting
+; Christian Denominations
+;
+K:denomination=anglican
+K:denomination=apostolic
+K:denomination=baptist
+K:denomination=catholic
+K:denomination=christian_community
+K:denomination=christian_scientist
+K:denomination=coptic_orthodox
+K:denomination=czechoslovak_hussite
+K:denomination=dutch_reformed
+K:denomination=evangelical
+K:denomination=foursquare
+K:denomination=greek_orthodox
+K:denomination=jehovahs_witness
+K:denomination=kabbalah
+K:denomination=karaite
+K:denomination=living_waters_church
+K:denomination=lutheran
+K:denomination=maronite
+K:denomination=mennonite
+K:denomination=methodist
+K:denomination=mormon
+K:denomination=new_apostolic
+K:denomination=nondenominational
+K:denomination=old_catholic
+K:denomination=orthodox
+K:denomination=pentecostal
+K:denomination=presbyterian
+K:denomination=protestant
+K:denomination=quaker
+K:denomination=roman_catholic
+K:denomination=russian_orthodox
+K:denomination=salvation_army
+K:denomination=seventh_day_adventist
+K:denomination=united
+K:denomination=united_reformed
+K:denomination=uniting
+;
+; Jewish Denominations
+;
+K:denomination=alternative
+K:denomination=ashkenazi
+K:denomination=conservative
+K:denomination=hasidic
+K:denomination=humanistic
+K:denomination=liberal
+K:denomination=modern_orthodox
+K:denomination=neo_orthodox
+K:denomination=nondenominational
+K:denomination=orthodox
+K:denomination=progressive
+K:denomination=reconstructionist
+K:denomination=reform
+K:denomination=renewal
+K:denomination=samaritan
+K:denomination=ultra_orthodox
+;
+; Muslim Denominations
+;
+K:denomination=alaouite
+K:denomination=druze
+K:denomination=ibadi
+K:denomination=ismaili
+K:denomination=nondenominational
+K:denomination=shia
+K:denomination=sunni
+;
+; Pastafarian Denominations
+;
+K:denomination=EVKdFSMiD
+;
+; Other Denominations
+;
+K:denomination=masonic
 ;
 ; Shop Key/Value Pairs
Index: trunk/data/tagchecker.cfg
===================================================================
--- trunk/data/tagchecker.cfg	(revision 5436)
+++ trunk/data/tagchecker.cfg	(revision 5475)
@@ -142,2 +142,8 @@
 *    : W : width                == * && highway != * && railway != * && waterway != * && aeroway != *  # width without highway/railway/waterway/aeroway
 *    : W : maxspeed             == * && highway != * && railway != * && traffic_sign != maxspeed # maxspeed without highway/railway/traffic_sign
+
+* : I : religion == /christian|jewish|muslim/ && denomination != * # religion without denomination
+* : I : religion == christian && denomination == * && denomination != /anglican|apostolic|baptist|catholic|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_orthodox|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|roman_catholic|russian_orthodox|salvation_army|seventh_day_adventist|united|united_reformed|uniting/  # unkown christian denomination
+* : I : religion == muslim && denomination == * && denomination != /alaouite|druze|ibadi|ismaili|nondenominational|shia|sunni/ # unkown muslim denomination
+* : I : religion == jewish && denomination == * && denomination != /alternative|ashkenazi|conservative|hasidic|humanistic|liberal|modern_orthodox|neo_orthodox|nondenominational|orthodox|progressive|reconstructionist|reform|renewal|samaritan|ultra_orthodox/ # unkown jewish denomination
+