diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index 6115ef81f2..087d9a648a 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -128,10 +128,8 @@
           "osmTags": {
             "or": [
               "image~*",
-              "image:0~*",
-              "image:1~*",
-              "image:2~*",
-              "image:3~*",
+              "image:[0-9]+~~*",
+              "panoramax:[0-9]+~~*",
               "mapillary~*"
             ]
           }
@@ -148,12 +146,14 @@
           },
           "osmTags": {
             "and": [
-              "image=",
-              "image:0=",
-              "image:1=",
-              "image:2=",
-              "image:3=",
-              "mapillary="
+              {
+                "or": [
+                  "image!~*",
+                  "image:[0-9]+!~~*",
+                  "panoramax:[0-9]+!~~*",
+                  "mapillary!~*"
+                ]
+              }
             ]
           }
         }