diff --git a/assets/layers/animal_shelter/animal_shelter.json b/assets/layers/animal_shelter/animal_shelter.json
new file mode 100644
index 000000000..f94bc6bb4
--- /dev/null
+++ b/assets/layers/animal_shelter/animal_shelter.json
@@ -0,0 +1,109 @@
+{
+  "id": "animal_shelter",
+  "credits": "Pieter Vander Vennet",
+  "source": {
+    "osmTags": "amenity=animal_shelter"
+  },
+  "presets": [
+    {
+      "title": {
+        "en": "an animal shelter"
+      },
+      "tags": [
+        "amenity=animal_shelter"
+      ]
+    }
+  ],
+  "lineRendering": [
+    {
+      "width": "1",
+      "lineCap": "square",
+      "color": "#b5835a"
+    }
+  ],
+  "pointRendering": [
+    {
+      "location": [
+        "centroid",
+        "point"
+      ],
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "#ffffff"
+        },
+        {
+          "icon": "https://upload.wikimedia.org/wikipedia/commons/7/7a/Animal_Shelter_%288670%29_-_The_Noun_Project.svg"
+        }
+      ]
+    }
+  ],
+  "title": {
+    "render": {
+      "en": "Animal shelter"
+    },
+    "mappings": [
+      {
+        "if": "name~*",
+        "then": {
+          "en": "{name}"
+        }
+      }
+    ]
+  },
+  "tagRenderings": [
+    "images",
+    "reviews",
+    {
+      "id": "2",
+      "freeform": {
+        "invalidValues": {},
+        "key": "name"
+      },
+      "question": {
+        "en": "What is the name of this animal shelter?"
+      },
+      "render": {
+        "en": "This animal shelter is named <b>{name}</b>"
+      }
+    },
+    "website",
+    "phone",
+    "email",
+    {
+      "id": "6",
+      "question": {
+        "en": "What is the purpose of the animal shelter?"
+      },
+      "mappings": [
+        {
+          "then": {
+            "en": "Animals are kept here until adopted by a new owner"
+          },
+          "if": "purpose=adoption"
+        },
+        {
+          "then": {
+            "en": "Animals are taken care of for the rest of their lives"
+          },
+          "if": "purpose=sanctuary"
+        },
+        {
+          "then": {
+            "en": "Injured animals are rehabilitated here until they can be released in nature again "
+          },
+          "if": "purpose=release"
+        }
+      ],
+      "multiAnswer": true
+    }
+  ],
+  "deletion": true,
+  "allowMove": true,
+  "name": {
+    "en": "Animal shelters"
+  },
+  "description": {
+    "en": "An animal shelter is a facility where animals in trouble are brought and facility's staff (volunteers or not) feeds them and cares of them, rehabilitating and healing them if necessary. This definition includes kennels for abandoned dogs, catteries for abandoned cats, shelters for other abandoned pets and wildlife recovery centres. "
+  }
+}
diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json
index cef762a1e..35f0a799c 100644
--- a/assets/layers/climbing_opportunity/climbing_opportunity.json
+++ b/assets/layers/climbing_opportunity/climbing_opportunity.json
@@ -139,4 +139,4 @@
       "width": "2"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index caef96c84..410bb1d48 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -139,7 +139,8 @@
             "fixme=freeform shop key used, to be reviewed"
           ]
         },
-        "condition": "craft="
+        "condition": "craft=",
+        "invalidValues": "shop=yes"
       }
     },
     "opening_hours",