diff --git a/dist/historical/historical.json b/dist/historical/historical.json
index 97c475a3..1c7b0300 100644
--- a/dist/historical/historical.json
+++ b/dist/historical/historical.json
@@ -914,12 +914,41 @@
       "minzoom": 11,
       "maxzoom": 24,
       "filter": [
-        "==",
+        "all",
         [
-          "get",
-          "type"
+          "==",
+          [
+            "get",
+            "type"
+          ],
+          "cemetery"
+        ],
+        [
+          "==",
+          [
+            "get",
+            "religion"
+          ],
+          "christian"
         ],
-        "cemetery"
+        [
+          "!",
+          [
+            "in",
+            [
+              "get",
+              "denomination"
+            ],
+            [
+              "literal",
+              [
+                "jehovahs_witness",
+                "mormon",
+                "iglesia_ni_cristo"
+              ]
+            ]
+          ]
+        ]
       ],
       "layout": {
         "visibility": "visible"
diff --git a/dist/ohm.styles.js b/dist/ohm.styles.js
index 52994d4e..cc5041c7 100644
--- a/dist/ohm.styles.js
+++ b/dist/ohm.styles.js
@@ -917,12 +917,41 @@ ohmVectorStyles = {
         "minzoom": 11,
         "maxzoom": 24,
         "filter": [
-          "==",
+          "all",
           [
-            "get",
-            "type"
+            "==",
+            [
+              "get",
+              "type"
+            ],
+            "cemetery"
+          ],
+          [
+            "==",
+            [
+              "get",
+              "religion"
+            ],
+            "christian"
           ],
-          "cemetery"
+          [
+            "!",
+            [
+              "in",
+              [
+                "get",
+                "denomination"
+              ],
+              [
+                "literal",
+                [
+                  "jehovahs_witness",
+                  "mormon",
+                  "iglesia_ni_cristo"
+                ]
+              ]
+            ]
+          ]
         ],
         "layout": {
           "visibility": "visible"
diff --git a/historical/historical.json b/historical/historical.json
index c6d77a8e..59c16867 100644
--- a/historical/historical.json
+++ b/historical/historical.json
@@ -579,7 +579,19 @@
       "source-layer": "landuse_areas",
       "minzoom": 11,
       "maxzoom": 24,
-      "filter": ["==", ["get", "type"], "cemetery"],
+      "filter": [
+        "all",
+        ["==", ["get", "type"], "cemetery"],
+        ["==", ["get", "religion"], "christian"],
+        [
+          "!",
+          [
+            "in",
+            ["get", "denomination"],
+            ["literal", ["jehovahs_witness", "mormon", "iglesia_ni_cristo"]]
+          ]
+        ]
+      ],
       "layout": {"visibility": "visible"},
       "paint": {
         "fill-pattern": "cross_space_18px",