Yes exactly. A charitable purpose only needs to meet the very generic criteria of being beneficial to the community (or the others, relieving poverty or advancing education).
If a church is a net positive for the community, or helps those in poverty, it would still qualify. So let's get rid of the specific religion clause and let churches prove they are a net benefit to the community.