diff --git a/dist/historical/historical.json b/dist/historical/historical.json
index ad79cabb..f69f8b17 100644
--- a/dist/historical/historical.json
+++ b/dist/historical/historical.json
@@ -919,15 +919,39 @@
       "minzoom": 11,
       "maxzoom": 24,
       "filter": [
-        "in",
+        "all",
         [
-          "get",
-          "type"
+          "==",
+          [
+            "get",
+            "type"
+          ],
+          "cemetery"
         ],
         [
-          "literal",
+          "==",
+          [
+            "get",
+            "religion"
+          ],
+          "christian"
+        ],
+        [
+          "!",
           [
-            "cemetery"
+            "in",
+            [
+              "get",
+              "denomination"
+            ],
+            [
+              "literal",
+              [
+                "jehovahs_witness",
+                "mormon",
+                "iglesia_ni_cristo"
+              ]
+            ]
           ]
         ]
       ],
diff --git a/dist/ohm.styles.js b/dist/ohm.styles.js
index d8c2347f..bb7a9b5b 100644
--- a/dist/ohm.styles.js
+++ b/dist/ohm.styles.js
@@ -922,15 +922,39 @@ ohmVectorStyles = {
         "minzoom": 11,
         "maxzoom": 24,
         "filter": [
-          "in",
+          "all",
           [
-            "get",
-            "type"
+            "==",
+            [
+              "get",
+              "type"
+            ],
+            "cemetery"
           ],
           [
-            "literal",
+            "==",
             [
-              "cemetery"
+              "get",
+              "religion"
+            ],
+            "christian"
+          ],
+          [
+            "!",
+            [
+              "in",
+              [
+                "get",
+                "denomination"
+              ],
+              [
+                "literal",
+                [
+                  "jehovahs_witness",
+                  "mormon",
+                  "iglesia_ni_cristo"
+                ]
+              ]
             ]
           ]
         ],
diff --git a/historical/historical.json b/historical/historical.json
index 23ce22ec..7292f2be 100644
--- a/historical/historical.json
+++ b/historical/historical.json
@@ -580,9 +580,17 @@
       "minzoom": 11,
       "maxzoom": 24,
       "filter": [
-        "in",
-        ["get", "type"],
-        ["literal", ["cemetery"]]
+        "all",
+        ["==", ["get", "type"], "cemetery"],
+        ["==", ["get", "religion"], "christian"],
+        [
+          "!",
+          [
+            "in",
+            ["get", "denomination"],
+            ["literal", ["jehovahs_witness", "mormon", "iglesia_ni_cristo"]]
+          ]
+        ]
       ],
       "layout": {"visibility": "visible"},
       "paint": {