diff --git a/assets/layers/toilet_at_amenity/toilet_at_amenity.json b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
index ef47dae59f..615ee37de9 100644
--- a/assets/layers/toilet_at_amenity/toilet_at_amenity.json
+++ b/assets/layers/toilet_at_amenity/toilet_at_amenity.json
@@ -140,14 +140,30 @@
   ],
   "lineRendering": [],
   "tagRenderings": [
-    "images",
+    {
+      "render": {
+        "special": {
+          "before": "{image_carousel(toilets:panoramax;toilets:mapillary;toilets:images)}",
+          "type": "image_upload",
+          "key": "toilets:panoramax",
+          "label": {
+            "en": "Add a picture of the toilets",
+            "nl": "Voeg een foto van de toiletten toe"
+          }
+        }
+      }
+    },
     {
       "id": "dead",
       "labels": [
         "hidden",
         "relevant_questions"
       ],
-      "condition": "id=",
+      "condition": {
+        "and": [
+          "id="
+        ]
+      },
       "render": "Only used to make sure 'relevant-questions' is known"
     },
     {