Yes, I think it's probably a good idea to just add denomination=* wherever we have religion=*.  The only downside is that the denomination dropdown wouldn't be filtered, so it will just show all the tags, not just the ones that apply to the selected religion.