diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json
index ea82ade00..0d639fce0 100644
--- a/assets/layers/stairs/stairs.json
+++ b/assets/layers/stairs/stairs.json
@@ -83,6 +83,43 @@
         }
       }
     },
+    {
+      "id": "conveying",
+      "mappings": [
+        {
+          "if": "conveying=yes",
+          "then": {
+            "en": "This is an escalator",
+            "nl": "Dit is een roltrap",
+            "de": "Das ist eine Rolltreppe",
+            "ca": "Açò és una escala mecànica",
+            "cs": "Jedná se o eskalátor"
+          }
+        },
+        {
+          "if": "conveying=no",
+          "then": {
+            "en": "This is not an escalator",
+            "nl": "Dit is geen roltrap",
+            "de": "Das ist keine Rolltreppe",
+            "ca": "Açò no és una escala mecànica",
+            "cs": "Nejedná se o eskalátor"
+          }
+        },
+        {
+          "if": "conveying=",
+          "then": {
+            "en": "This is not an escalator",
+            "nl": "Dit is geen roltrap",
+            "de": "Das ist keine Rolltreppe",
+            "ca": "Això no és una escala mecànica",
+            "cs": "Nejedná se o eskalátor"
+          },
+          "hideInAnswer": true
+        }
+      ]
+    },
+
     {
       "id": "handrail",
       "question": {
@@ -113,11 +150,12 @@
             "cs": "Tyto schody <b>nemají</b> zábradlí"
           }
         }
-      ]
+      ],
+      "condition": "conveying!=yes"
     },
     {
       "id": "tactile_writing",
-      "condition": "handrail=yes",
+      "condition": ["handrail=yes", "conveying!=yes"],
       "question": {
         "en": "Do these stairs have tactile writing on the handrail?",
         "de": "Hat die Treppe eine taktile Schrift am Handlauf?",
@@ -179,42 +217,6 @@
         }
       }
     },
-    {
-      "id": "conveying",
-      "mappings": [
-        {
-          "if": "conveying=yes",
-          "then": {
-            "en": "This is an escalator",
-            "nl": "Dit is een roltrap",
-            "de": "Das ist eine Rolltreppe",
-            "ca": "Açò és una escala mecànica",
-            "cs": "Jedná se o eskalátor"
-          }
-        },
-        {
-          "if": "conveying=no",
-          "then": {
-            "en": "This is not an escalator",
-            "nl": "Dit is geen roltrap",
-            "de": "Das ist keine Rolltreppe",
-            "ca": "Açò no és una escala mecànica",
-            "cs": "Nejedná se o eskalátor"
-          }
-        },
-        {
-          "if": "conveying=",
-          "then": {
-            "en": "This is not an escalator",
-            "nl": "Dit is geen roltrap",
-            "de": "Das ist keine Rolltreppe",
-            "ca": "Això no és una escala mecànica",
-            "cs": "Nejedná se o eskalátor"
-          },
-          "hideInAnswer": true
-        }
-      ]
-    },
     {
       "id": "ramp",
       "question": {
@@ -281,7 +283,8 @@
             "cs": "U těchto schodů není žádná rampa"
           }
         }
-      ]
+      ],
+      "condition": "conveying!=yes"
     }
   ]
 }
diff --git a/package.json b/package.json
index 98d8a9e59..a0a0d9371 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mapcomplete",
-  "version": "0.34.6",
+  "version": "0.34.7",
   "repository": "https://github.com/pietervdvn/MapComplete",
   "description": "A small website to edit OSM easily",
   "bugs": "https://github.com/pietervdvn/MapComplete/issues",