diff --git a/car_routes.json b/car_routes.json
index 22e00baa7..1125d21c4 100644
--- a/car_routes.json
+++ b/car_routes.json
@@ -1,7 +1,8 @@
 {
     "type": "overpass",
     "name": {
-        "en": "Car routes"
+        "en": "Car routes",
+        "pt-br": "Rota rodoviária"
     },
     "query": {
         "10": "relation[type=route][route=road]"
diff --git a/emergency.json b/emergency.json
index 2889d1efb..588c14dee 100644
--- a/emergency.json
+++ b/emergency.json
@@ -44,11 +44,12 @@
             "{% elseif tags.emergency %}",
             "{% set key = 'emergency' %}",
             "{% set value = tags.emergency %}",
-            "{% endif %}"
+            "{% endif %}",
+            "{% set kv = key ~ \"=\" ~ value %}"
         ],
-        "description": "{{ tagTrans('amenity', tags.amenity) }}",
+        "description": "{{ tagTrans(key, value) }}",
         "markerSign": [
-            "{% set data = const[tags.amenity] %}",
+            "{% set data = const[kv] %}",
             "{% if data %}",
             "{{ data.sign }}",
             "{% endif %}"
diff --git a/index.json b/index.json
index cf3cf7ebd..e2236974f 100644
--- a/index.json
+++ b/index.json
@@ -119,7 +119,7 @@
                 "ro": "Transport",
                 "ru": "Транспорт",
                 "uk": "Транспорт",
-                "pt-br": "Transportes",
+                "pt-br": "Mobilidade",
                 "pt": "Transportes"
             },
             "subCategories": [
diff --git a/lang/pt-br.json b/lang/pt-br.json
index e51b8bbc3..60568c0cb 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -7,6 +7,7 @@
     "category:car_amenities": "Equipamentos",
     "category:car_furniture": "Mobiliário urbano",
     "category:car_maxspeed": "Velocidade máxima",
+    "category:car_routes": "Rota rodoviária",
     "category:children": "Equipamentos infantis",
     "category:communication": "Comunicação",
     "category:construction": "Terrenos vazios e obras",
@@ -63,7 +64,7 @@
     "category:railway": "Ferrovia",
     "category:services": "Prestação de serviços",
     "category:special": "Especial",
-    "category:transport": "Transportes",
+    "category:transport": "Mobilidade",
     "category:transport_car": "Tráfego individual",
     "category:transport_cycle": "Ciclismo",
     "category:transport_pt": "Transporte público",
diff --git a/water.json b/water.json
index 137f0b90c..f70d0edc0 100644
--- a/water.json
+++ b/water.json
@@ -51,7 +51,7 @@
             "0",
             "{% elseif tags.waterway == 'river' %}",
             "1",
-            "{% elseif tags.waterway == 'stream' %}",
+            "{% elseif tags.waterway == 'stream' or tags.waterway == 'drain' %}",
             "3",
             "{% elseif tags.waterway == 'ditch' %}",
             "5",
@@ -63,7 +63,7 @@
             "width": [
                 "{% if tags.waterway == 'river' %}",
                 "4",
-                "{% elseif tags.waterway == 'stream' %}",
+                "{% elseif tags.waterway == 'stream' or tags.waterway == 'drain' %}",
                 "2",
                 "{% elseif tags.waterway == 'ditch' %}",
                 "1",
@@ -81,7 +81,7 @@
                 "{% endif %}"
             ],
             "text": [
-                "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'ditch', 'wadi', 'drystream' ] %}",
+                "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'ditch', 'wadi', 'drystream', 'drain' ] %}",
                 "{{ tags.name }}   ➔   ",
                 "{% endif %}"
             ],
@@ -102,7 +102,7 @@
         "{% if map.zoom >= 13 %}",
         "  <tr>",
         "    <td>{{ markerLine(evaluate({ \"waterway\": \"stream\" }))|raw }}</td>",
-        "    <td>{{ tagTrans('waterway', 'stream') }}</td>",
+        "    <td>{{ tagTrans('waterway', 'stream') }}, {{ tagTrans('waterway', 'drain') }}</td>",
         "  </tr>",
         "  <tr>",
         "    <td>{{ markerLine(evaluate({ \"waterway\": \"ditch\" }))|raw }}</td>",