diff --git a/children.json b/children.json
index fa2efec0..03332fed 100644
--- a/children.json
+++ b/children.json
@@ -16,8 +16,7 @@
             "node[shop~'^(baby_goods|toys)$'];",
             "way[shop~'^(baby_goods|toys)$'];",
             "relation[shop~'^(baby_goods|toys)$'];",
-            "node[amenity=toilets][diaper];",
-            "way[amenity=toilets][diaper];relation[amenity=toilets][diaper];",
+            "nwr[amenity=toilets][changing_table][changing_table!=no];",
             "node[kids_area];",
             "way[kids_area];",
             "relation[kids_area];",
@@ -36,7 +35,7 @@
             "{{ keyTrans('kids_area') }}",
             "{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}",
             "{{ keyTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}",
-            "{% elseif tags.amenity=='toilets' and tags.diaper %}",
+            "{% elseif tags.amenity=='toilets' and tags.changing_table and tags.changing_table!='no' %}",
             "{{ tagTrans('amenity', 'toilets diaper=yes') }}",
             "{% endif %}"
         ],
@@ -49,7 +48,7 @@
             "🏠",
             "{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}",
             "<i class=\"fa fa-shopping-cart\"></i>",
-            "{% elseif tags.amenity=='toilets' and tags.diaper %}",
+            "{% elseif tags.amenity=='toilets' and tags.changing_table and tags.changing_table!='no' %}",
             "🚽🚼",
             "{% endif %}"
         ]
@@ -114,7 +113,7 @@
                 },
                 "toilets": {
                     "name": "{{ tagTrans('amenity', 'toilets diaper=yes') }}",
-                    "query": "nwr[amenity=toilets][diaper]"
+                    "query": "nwr[amenity=toilets][changing_table][changing_table!=no]"
                 }
             }
         }