diff --git a/profiles/car.lua b/profiles/car.lua
index 867c74c01..a3d3cd24a 100644
--- a/profiles/car.lua
+++ b/profiles/car.lua
@@ -246,31 +246,31 @@ function setup()
 
     -- List only exceptions
     maxspeed_table = {
+      ["at:rural"] = 100,
+      ["at:trunk"] = 100,
       ["be:motorway"] = 120,
       ["ch:rural"] = 80,
       ["ch:trunk"] = 100,
       ["ch:motorway"] = 120,
-      ["de:living_street"] = 7,
-      ["dk:rural"] = 80,
-      ["ru:living_street"] = 20,
-      ["ru:urban"] = 60,
-      ["ua:urban"] = 60,
-      ["at:rural"] = 100,
-      ["de:rural"] = 100,
-      ["at:trunk"] = 100,
       ["cz:trunk"] = 0,
-      ["ro:trunk"] = 100,
       ["cz:motorway"] = 0,
+      ["de:living_street"] = 7,
+      ["de:rural"] = 100,
       ["de:motorway"] = 0,
-      ["ru:motorway"] = 110,
+      ["dk:rural"] = 80,
       ["gb:nsl_single"] = (60*1609)/1000,
       ["gb:nsl_dual"] = (70*1609)/1000,
       ["gb:motorway"] = (70*1609)/1000,
+      ["nl:rural"] = 80,
+      ["nl:trunk"] = 100,
+      ["ro:trunk"] = 100,
+      ["ru:living_street"] = 20,
+      ["ru:urban"] = 60,
+      ["ru:motorway"] = 110,
+      ["ua:urban"] = 60,
       ["uk:nsl_single"] = (60*1609)/1000,
       ["uk:nsl_dual"] = (70*1609)/1000,
       ["uk:motorway"] = (70*1609)/1000,
-      ["nl:rural"] = 80,
-      ["nl:trunk"] = 100,
       ["none"] = 140
     }
   }
diff --git a/taginfo.json b/taginfo.json
index a8b77e05a..e13cbee97 100644
--- a/taginfo.json
+++ b/taginfo.json
@@ -144,32 +144,31 @@
         {"key": "maxspeed", "value": "rural"},
         {"key": "maxspeed", "value": "trunk"},
         {"key": "maxspeed", "value": "motorway"},
+        {"key": "maxspeed", "value": "AT:rural"},
+        {"key": "maxspeed", "value": "AT:trunk"},
         {"key": "maxspeed", "value": "BE:motorway"},
         {"key": "maxspeed", "value": "CH:rural"},
         {"key": "maxspeed", "value": "CH:trunk"},
         {"key": "maxspeed", "value": "CH:motorway"},
-        {"key": "maxspeed", "value": "DE:living_street"},
-        {"key": "maxspeed", "value": "DK:rural"},
-        {"key": "maxspeed", "value": "RU:living_street"},
-        {"key": "maxspeed", "value": "RU:urban"},
-        {"key": "maxspeed", "value": "UA:urban"},
-        {"key": "maxspeed", "value": "AT:rural"},
-        {"key": "maxspeed", "value": "DE:rural"},
-        {"key": "maxspeed", "value": "DK:rural"},
-        {"key": "maxspeed", "value": "AT:trunk"},
         {"key": "maxspeed", "value": "CZ:trunk"},
-        {"key": "maxspeed", "value": "RO:trunk"},
         {"key": "maxspeed", "value": "CZ:motorway"},
+        {"key": "maxspeed", "value": "DE:living_street"},
+        {"key": "maxspeed", "value": "DE:rural"},
         {"key": "maxspeed", "value": "DE:motorway"},
-        {"key": "maxspeed", "value": "RU:motorway"},
+        {"key": "maxspeed", "value": "DK:rural"},
         {"key": "maxspeed", "value": "GB:nsl_single"},
         {"key": "maxspeed", "value": "GB:nsl_dual"},
         {"key": "maxspeed", "value": "GB:motorway"},
+        {"key": "maxspeed", "value": "NL:rural"},
+        {"key": "maxspeed", "value": "NL:trunk"},
+        {"key": "maxspeed", "value": "RO:trunk"},
+        {"key": "maxspeed", "value": "RU:living_street"},
+        {"key": "maxspeed", "value": "RU:urban"},
+        {"key": "maxspeed", "value": "RU:motorway"},
+        {"key": "maxspeed", "value": "UA:urban"},
         {"key": "maxspeed", "value": "UK:nsl_single"},
         {"key": "maxspeed", "value": "UK:nsl_dual"},
         {"key": "maxspeed", "value": "UK:motorway"},
-        {"key": "maxspeed", "value": "NL:rural"},
-        {"key": "maxspeed", "value": "NL:trunk"},
         {"key": "smoothness", "value": "intermediate"},
         {"key": "smoothness", "value": "bad"},
         {"key": "smoothness", "value": "very_bad"},