diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index f5c91424e2..bbd65047ce 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -337,17 +337,32 @@
     },
     "questions",
     {
-      "id": "street-name-sign-image",
+      "id": "streetsign-image-carousel",
       "render": {
-        "en": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Add image of a street name sign)}",
-        "nl": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}",
-        "de": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Bild eines Straßenschildes hinzufügen)}",
-        "fr": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Ajouter une photo de la plaque de rue)}",
-        "ca": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Afegeix una imatge de la placa amb el nom del carrer)}",
-        "cs": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Add image of a street name sign)}",
-        "da": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Tilføj foto af gadenavneskilt)}",
-        "es": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Agregar imagen de un letrero de nombre de calle)}",
-        "uk": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Додати зображення таблички з назвою вулиці)}"
+        "special": {
+          "type": "image_carousel",
+          "image_key": "image:streetsign;panoramax:streetsign"
+        }
+      }
+    },
+    {
+      "id": "streetsign-upload",
+      "render": {
+        "special": {
+          "type": "image_upload",
+          "image_key": "image:streetsign",
+          "label": {
+            "en": "Add image of a street name sign",
+            "nl": "Voeg afbeelding van straatnaambordje toe",
+            "de": "Bild eines Straßenschildes hinzufügen",
+            "fr": "Ajouter une photo de la plaque de rue",
+            "ca": "Afegeix una imatge de la placa amb el nom del carrer",
+            "cs": "Add image of a street name sign",
+            "da": "Tilføj foto af gadenavneskilt",
+            "es": "Agregar imagen de un letrero de nombre de calle",
+            "uk": "Додати зображення таблички з назвою вулиці"
+          }
+        }
       }
     },
     {
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 1905cc3c77..c259f6edbb 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -627,7 +627,7 @@
       "render": {
         "special": {
           "type": "image_upload",
-          "image-key": "image:menu",
+          "image_key": "image:menu",
           "label": {
             "en": "Add an image from the menu",
             "nl": "Voeg een foto van het menu toe",