diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 6a84102f2f..6488321b86 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -131,7 +131,8 @@
       "render":{
         "en": "<a href='#{_closest_other_drinking_water_id}'>There is another drinking water fountain at {_closest_other_drinking_water_distance} meter</a>",
         "nl": "<a href='#{_closest_other_drinking_water_id}'>Er bevindt zich een ander drinkwaterpunt op {_closest_other_drinking_water_distance} meter</a>"
-      }
+      },
+      "condition": "_closest_other_drinking_water_id~*"
     }
   ]
 }
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 338d7c6bc2..a7fd654509 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -80,7 +80,7 @@
   },
   "last_edit": {
     "#": "Gives some metainfo about the last edit and who did edit it - rendering only",
-    "#condition": "_last_edit:contributor~*",
+    "condition": "_last_edit:contributor~*",
     "render": "<div class='subtle' style='font-size: small; margin-top: 2em; margin-bottom: 0.5em;'><a href='https://www.openStreetMap.org/changeset/{_last_edit:changeset}' target='_blank'>Last edited on {_last_edit:timestamp}</a> by <a href='https://www.openStreetMap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a></div>"
   }
 }
\ No newline at end of file