diff --git a/data/core.yaml b/data/core.yaml
index d355d41e8..9c2d9426a 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1174,28 +1174,10 @@ en:
       icon_tooltip: warning
     options:
       title: Options
-    disconnected_way:
-      highway:
-        message: "{highway} is disconnected from other roads and paths."
-        tip: Highways should connect to other highways or building entrances.
-    old_multipolygon:
-      message: "{multipolygon} has misplaced tags."
-      tip: Multipolygons should be tagged on their relation, not their outer way.
-    untagged_feature:
-      message: "{feature} has no descriptive tags."
-      tip: Features must have tags that define what they are.
-    many_deletions:
-      message: "Deleting {n} features: {p} nodes, {l} lines, {a} areas, and {r} relations."
-      tip:  Only redundant or nonexistent features should be deleted.
-    tag_suggests_area:
-      message: 'Feature is a line, but the tag "{tag}" suggests it should be an area.'
-      tip: Areas must have connected endpoints.
-    deprecated_tags:
-      message: '{feature} has outdated tags: {tags}'
-      tip: Some tags become deprecated over time and should be replaced.
-    generic_name:
-      message: '{feature} has the generic name "{name}".'
-      tip: Names should be the official, on-the-ground titles of features.
+    almost_junction:
+      message: "{feature} is very close but not connected to {feature2}."
+      highway-highway:
+        tip: Intersecting highways should share a junction vertex.
     crossing_ways:
       message: "{feature} crosses {feature2} without enough context."
       building-building:
@@ -1226,10 +1208,28 @@ en:
         tip: Crossing bridges should use different layers.
       bridge-bridge_connectable:
         tip: Crossing bridges should be connected or use different layers.
-    almost_junction:
-      message: "{feature} is very close but not connected to {feature2}."
-      highway-highway:
-        tip: Intersecting highways should share a junction vertex.
+    deprecated_tags:
+      message: '{feature} has outdated tags: {tags}'
+      tip: Some tags become deprecated over time and should be replaced.
+    disconnected_way:
+      highway:
+        message: "{highway} is disconnected from other roads and paths."
+        tip: Highways should connect to other highways or building entrances.
+    generic_name:
+      message: '{feature} has the generic name "{name}".'
+      tip: Names should be the official, on-the-ground titles of features.
+    many_deletions:
+      message: "Deleting {n} features: {p} nodes, {l} lines, {a} areas, and {r} relations."
+      tip:  Only redundant or nonexistent features should be deleted.
+    old_multipolygon:
+      message: "{multipolygon} has misplaced tags."
+      tip: Multipolygons should be tagged on their relation, not their outer way.
+    tag_suggests_area:
+      message: 'Feature is a line, but the tag "{tag}" suggests it should be an area.'
+      tip: Areas must have connected endpoints.
+    untagged_feature:
+      message: "{feature} has no descriptive tags."
+      tip: Features must have tags that define what they are.
     fix:
       add_connection_vertex:
         title: Connect the features
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a53ba79b2..f5d23fb48 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1424,36 +1424,12 @@
             "options": {
                 "title": "Options"
             },
-            "disconnected_way": {
-                "highway": {
-                    "message": "{highway} is disconnected from other roads and paths.",
-                    "tip": "Highways should connect to other highways or building entrances."
+            "almost_junction": {
+                "message": "{feature} is very close but not connected to {feature2}.",
+                "highway-highway": {
+                    "tip": "Intersecting highways should share a junction vertex."
                 }
             },
-            "old_multipolygon": {
-                "message": "{multipolygon} has misplaced tags.",
-                "tip": "Multipolygons should be tagged on their relation, not their outer way."
-            },
-            "untagged_feature": {
-                "message": "{feature} has no descriptive tags.",
-                "tip": "Features must have tags that define what they are."
-            },
-            "many_deletions": {
-                "message": "Deleting {n} features: {p} nodes, {l} lines, {a} areas, and {r} relations.",
-                "tip": "Only redundant or nonexistent features should be deleted."
-            },
-            "tag_suggests_area": {
-                "message": "Feature is a line, but the tag \"{tag}\" suggests it should be an area.",
-                "tip": "Areas must have connected endpoints."
-            },
-            "deprecated_tags": {
-                "message": "{feature} has outdated tags: {tags}",
-                "tip": "Some tags become deprecated over time and should be replaced."
-            },
-            "generic_name": {
-                "message": "{feature} has the generic name \"{name}\".",
-                "tip": "Names should be the official, on-the-ground titles of features."
-            },
             "crossing_ways": {
                 "message": "{feature} crosses {feature2} without enough context.",
                 "building-building": {
@@ -1499,12 +1475,36 @@
                     "tip": "Crossing bridges should be connected or use different layers."
                 }
             },
-            "almost_junction": {
-                "message": "{feature} is very close but not connected to {feature2}.",
-                "highway-highway": {
-                    "tip": "Intersecting highways should share a junction vertex."
+            "deprecated_tags": {
+                "message": "{feature} has outdated tags: {tags}",
+                "tip": "Some tags become deprecated over time and should be replaced."
+            },
+            "disconnected_way": {
+                "highway": {
+                    "message": "{highway} is disconnected from other roads and paths.",
+                    "tip": "Highways should connect to other highways or building entrances."
                 }
             },
+            "generic_name": {
+                "message": "{feature} has the generic name \"{name}\".",
+                "tip": "Names should be the official, on-the-ground titles of features."
+            },
+            "many_deletions": {
+                "message": "Deleting {n} features: {p} nodes, {l} lines, {a} areas, and {r} relations.",
+                "tip": "Only redundant or nonexistent features should be deleted."
+            },
+            "old_multipolygon": {
+                "message": "{multipolygon} has misplaced tags.",
+                "tip": "Multipolygons should be tagged on their relation, not their outer way."
+            },
+            "tag_suggests_area": {
+                "message": "Feature is a line, but the tag \"{tag}\" suggests it should be an area.",
+                "tip": "Areas must have connected endpoints."
+            },
+            "untagged_feature": {
+                "message": "{feature} has no descriptive tags.",
+                "tip": "Features must have tags that define what they are."
+            },
             "fix": {
                 "add_connection_vertex": {
                     "title": "Connect the features",