diff --git a/advisories/github-reviewed/2019/04/GHSA-6c3j-c64m-qhgq/GHSA-6c3j-c64m-qhgq.json b/advisories/github-reviewed/2019/04/GHSA-6c3j-c64m-qhgq/GHSA-6c3j-c64m-qhgq.json
index 572ed3decee..ddd7b095d1a 100644
--- a/advisories/github-reviewed/2019/04/GHSA-6c3j-c64m-qhgq/GHSA-6c3j-c64m-qhgq.json
+++ b/advisories/github-reviewed/2019/04/GHSA-6c3j-c64m-qhgq/GHSA-6c3j-c64m-qhgq.json
@@ -76,6 +76,10 @@
       "type": "WEB",
       "url": "https://blog.jquery.com/2019/04/10/jquery-3-4-0-released/"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/jquery/jquery"
+    },
     {
       "type": "WEB",
       "url": "https://kb.pulsesecure.net/articles/Pulse_Security_Advisories/SA44601"
@@ -323,10 +327,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/108023"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/jquery/jquery"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-mw6v-crh8-8533/GHSA-mw6v-crh8-8533.json b/advisories/github-reviewed/2019/04/GHSA-mw6v-crh8-8533/GHSA-mw6v-crh8-8533.json
index 6b0c5ed8503..6c0dc3f2196 100644
--- a/advisories/github-reviewed/2019/04/GHSA-mw6v-crh8-8533/GHSA-mw6v-crh8-8533.json
+++ b/advisories/github-reviewed/2019/04/GHSA-mw6v-crh8-8533/GHSA-mw6v-crh8-8533.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/tensorflow/tensorflow/commit/d107fee1e4a9a4462f01564798d345802acc2aef"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/tensorflow/tensorflow/blob/master/tensorflow/security/advisory/tfsa-2018-004.md"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/tensorflow/tensorflow"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/tensorflow/tensorflow/blob/master/tensorflow/security/advisory/tfsa-2018-004.md"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/05/GHSA-27v7-qhfv-rqq8/GHSA-27v7-qhfv-rqq8.json b/advisories/github-reviewed/2019/05/GHSA-27v7-qhfv-rqq8/GHSA-27v7-qhfv-rqq8.json
index 9eacbad761d..82f4567f93f 100644
--- a/advisories/github-reviewed/2019/05/GHSA-27v7-qhfv-rqq8/GHSA-27v7-qhfv-rqq8.json
+++ b/advisories/github-reviewed/2019/05/GHSA-27v7-qhfv-rqq8/GHSA-27v7-qhfv-rqq8.json
@@ -40,6 +40,10 @@
       "type": "WEB",
       "url": "https://github.com/ethereum/web3.js/issues/2739"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/ethereum/web3.js"
+    },
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JS-WEB3-174533"
@@ -47,10 +51,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/877"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/ethereum/web3.js"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/05/GHSA-87mg-h5r3-hw88/GHSA-87mg-h5r3-hw88.json b/advisories/github-reviewed/2019/05/GHSA-87mg-h5r3-hw88/GHSA-87mg-h5r3-hw88.json
index 4e2b5cc7814..232c8b0f972 100644
--- a/advisories/github-reviewed/2019/05/GHSA-87mg-h5r3-hw88/GHSA-87mg-h5r3-hw88.json
+++ b/advisories/github-reviewed/2019/05/GHSA-87mg-h5r3-hw88/GHSA-87mg-h5r3-hw88.json
@@ -41,13 +41,13 @@
       "type": "WEB",
       "url": "https://hackerone.com/reports/508446"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/882"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/makeusabrew/bootbox"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/882"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/05/GHSA-g86p-hgx5-2pfh/GHSA-g86p-hgx5-2pfh.json b/advisories/github-reviewed/2019/05/GHSA-g86p-hgx5-2pfh/GHSA-g86p-hgx5-2pfh.json
index 51fb491a910..51a73fee4c0 100644
--- a/advisories/github-reviewed/2019/05/GHSA-g86p-hgx5-2pfh/GHSA-g86p-hgx5-2pfh.json
+++ b/advisories/github-reviewed/2019/05/GHSA-g86p-hgx5-2pfh/GHSA-g86p-hgx5-2pfh.json
@@ -69,13 +69,13 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-12300"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/buildbot/buildbot/wiki/OAuth-vulnerability-in-using-submitted-authorization-token-for-authentication"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/buildbot/buildbot"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/buildbot/buildbot/wiki/OAuth-vulnerability-in-using-submitted-authorization-token-for-authentication"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/06/GHSA-4qhx-g9wp-g9m6/GHSA-4qhx-g9wp-g9m6.json b/advisories/github-reviewed/2019/06/GHSA-4qhx-g9wp-g9m6/GHSA-4qhx-g9wp-g9m6.json
index 3981b7347bd..6581bb03a6f 100644
--- a/advisories/github-reviewed/2019/06/GHSA-4qhx-g9wp-g9m6/GHSA-4qhx-g9wp-g9m6.json
+++ b/advisories/github-reviewed/2019/06/GHSA-4qhx-g9wp-g9m6/GHSA-4qhx-g9wp-g9m6.json
@@ -37,13 +37,13 @@
       "type": "WEB",
       "url": "https://github.com/hiddentao/squel/issues/350"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/575"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/hiddentao/squel"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/575"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/06/GHSA-gc94-6w89-hpqr/GHSA-gc94-6w89-hpqr.json b/advisories/github-reviewed/2019/06/GHSA-gc94-6w89-hpqr/GHSA-gc94-6w89-hpqr.json
index deab4a4375f..541262b003f 100644
--- a/advisories/github-reviewed/2019/06/GHSA-gc94-6w89-hpqr/GHSA-gc94-6w89-hpqr.json
+++ b/advisories/github-reviewed/2019/06/GHSA-gc94-6w89-hpqr/GHSA-gc94-6w89-hpqr.json
@@ -37,6 +37,10 @@
       "type": "WEB",
       "url": "https://hackerone.com/reports/324491"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/pillys/fs-path"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/661"
@@ -44,10 +48,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/661"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/pillys/fs-path"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/06/GHSA-gm9g-2g8v-fvxj/GHSA-gm9g-2g8v-fvxj.json b/advisories/github-reviewed/2019/06/GHSA-gm9g-2g8v-fvxj/GHSA-gm9g-2g8v-fvxj.json
index b1b046cc216..cd477eb5c33 100644
--- a/advisories/github-reviewed/2019/06/GHSA-gm9g-2g8v-fvxj/GHSA-gm9g-2g8v-fvxj.json
+++ b/advisories/github-reviewed/2019/06/GHSA-gm9g-2g8v-fvxj/GHSA-gm9g-2g8v-fvxj.json
@@ -40,6 +40,10 @@
       "type": "WEB",
       "url": "https://hackerone.com/reports/439120"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/jazzfog/UpMerge"
+    },
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JS-UPMERGE-174133"
@@ -47,10 +51,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/809"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/jazzfog/UpMerge"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/07/GHSA-grgm-pph5-j5h7/GHSA-grgm-pph5-j5h7.json b/advisories/github-reviewed/2019/07/GHSA-grgm-pph5-j5h7/GHSA-grgm-pph5-j5h7.json
index 8e1661780d2..f8eb9afe9c9 100644
--- a/advisories/github-reviewed/2019/07/GHSA-grgm-pph5-j5h7/GHSA-grgm-pph5-j5h7.json
+++ b/advisories/github-reviewed/2019/07/GHSA-grgm-pph5-j5h7/GHSA-grgm-pph5-j5h7.json
@@ -94,6 +94,10 @@
       "type": "WEB",
       "url": "https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2019-10156"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/ansible/ansible"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2019/09/msg00016.html"
@@ -105,10 +109,6 @@
     {
       "type": "WEB",
       "url": "https://www.debian.org/security/2021/dsa-4950"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/ansible/ansible"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/07/GHSA-grmf-4fq6-2r79/GHSA-grmf-4fq6-2r79.json b/advisories/github-reviewed/2019/07/GHSA-grmf-4fq6-2r79/GHSA-grmf-4fq6-2r79.json
index c1a9955d20e..e0b31221374 100644
--- a/advisories/github-reviewed/2019/07/GHSA-grmf-4fq6-2r79/GHSA-grmf-4fq6-2r79.json
+++ b/advisories/github-reviewed/2019/07/GHSA-grmf-4fq6-2r79/GHSA-grmf-4fq6-2r79.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/aubio/aubio/commit/b1559f4c9ce2b304d8d27ffdc7128b6795ca82e5"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/aubio/aubio/blob/0.4.9/ChangeLog"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/aubio/aubio"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/aubio/aubio/blob/0.4.9/ChangeLog"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/07/GHSA-vg35-vc9f-q7x2/GHSA-vg35-vc9f-q7x2.json b/advisories/github-reviewed/2019/07/GHSA-vg35-vc9f-q7x2/GHSA-vg35-vc9f-q7x2.json
index 13c87b49e53..a14366d279d 100644
--- a/advisories/github-reviewed/2019/07/GHSA-vg35-vc9f-q7x2/GHSA-vg35-vc9f-q7x2.json
+++ b/advisories/github-reviewed/2019/07/GHSA-vg35-vc9f-q7x2/GHSA-vg35-vc9f-q7x2.json
@@ -45,6 +45,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-1010268"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://bitbucket.org/jakobsg/ladon"
+    },
     {
       "type": "WEB",
       "url": "https://bitbucket.org/jakobsg/ladon/pull-requests/9"
@@ -56,10 +60,6 @@
     {
       "type": "WEB",
       "url": "https://www.exploit-db.com/exploits/43113"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://bitbucket.org/jakobsg/ladon"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/08/GHSA-8rf6-w2mx-4xjh/GHSA-8rf6-w2mx-4xjh.json b/advisories/github-reviewed/2019/08/GHSA-8rf6-w2mx-4xjh/GHSA-8rf6-w2mx-4xjh.json
index 32d5a25cb5b..63cd7bdd861 100644
--- a/advisories/github-reviewed/2019/08/GHSA-8rf6-w2mx-4xjh/GHSA-8rf6-w2mx-4xjh.json
+++ b/advisories/github-reviewed/2019/08/GHSA-8rf6-w2mx-4xjh/GHSA-8rf6-w2mx-4xjh.json
@@ -42,13 +42,13 @@
       "type": "WEB",
       "url": "https://github.com/dw/mitogen/commit/5924af1566763e48c42028399ea0cd95c457b3dc"
     },
-    {
-      "type": "WEB",
-      "url": "https://mitogen.networkgenomics.com/changelog.html#v0-2-8-2019-08-18"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/dw/mitogen"
+    },
+    {
+      "type": "WEB",
+      "url": "https://mitogen.networkgenomics.com/changelog.html#v0-2-8-2019-08-18"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/08/GHSA-c4qh-4vgv-qc6g/GHSA-c4qh-4vgv-qc6g.json b/advisories/github-reviewed/2019/08/GHSA-c4qh-4vgv-qc6g/GHSA-c4qh-4vgv-qc6g.json
index b620135bc21..a378dd06ffb 100644
--- a/advisories/github-reviewed/2019/08/GHSA-c4qh-4vgv-qc6g/GHSA-c4qh-4vgv-qc6g.json
+++ b/advisories/github-reviewed/2019/08/GHSA-c4qh-4vgv-qc6g/GHSA-c4qh-4vgv-qc6g.json
@@ -82,6 +82,10 @@
       "type": "WEB",
       "url": "https://docs.djangoproject.com/en/dev/releases/security/"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/django/django"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/pypa/advisory-db/tree/main/vulns/django/PYSEC-2019-11.yaml"
@@ -121,10 +125,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2019-08/msg00025.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/django/django"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/08/GHSA-xc6x-cq47-9chw/GHSA-xc6x-cq47-9chw.json b/advisories/github-reviewed/2019/08/GHSA-xc6x-cq47-9chw/GHSA-xc6x-cq47-9chw.json
index c095fabbd34..a7303d4c8b5 100644
--- a/advisories/github-reviewed/2019/08/GHSA-xc6x-cq47-9chw/GHSA-xc6x-cq47-9chw.json
+++ b/advisories/github-reviewed/2019/08/GHSA-xc6x-cq47-9chw/GHSA-xc6x-cq47-9chw.json
@@ -43,13 +43,13 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-1258"
     },
-    {
-      "type": "WEB",
-      "url": "https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2019-1258"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/AzureAD/azure-activedirectory-library-for-dotnet"
+    },
+    {
+      "type": "WEB",
+      "url": "https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2019-1258"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2022/06/GHSA-4whx-7p29-mq22/GHSA-4whx-7p29-mq22.json b/advisories/github-reviewed/2022/06/GHSA-4whx-7p29-mq22/GHSA-4whx-7p29-mq22.json
index cb2f4c43716..3ef5b056d11 100644
--- a/advisories/github-reviewed/2022/06/GHSA-4whx-7p29-mq22/GHSA-4whx-7p29-mq22.json
+++ b/advisories/github-reviewed/2022/06/GHSA-4whx-7p29-mq22/GHSA-4whx-7p29-mq22.json
@@ -47,13 +47,13 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2022-31011"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/pingcap/tidb/releases/tag/v5.3.1"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/pingcap/tidb"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/pingcap/tidb/releases/tag/v5.3.1"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2022/06/GHSA-r7jw-mg27-j839/GHSA-r7jw-mg27-j839.json b/advisories/github-reviewed/2022/06/GHSA-r7jw-mg27-j839/GHSA-r7jw-mg27-j839.json
index f61e8c88057..3955be286d1 100644
--- a/advisories/github-reviewed/2022/06/GHSA-r7jw-mg27-j839/GHSA-r7jw-mg27-j839.json
+++ b/advisories/github-reviewed/2022/06/GHSA-r7jw-mg27-j839/GHSA-r7jw-mg27-j839.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/neorazorx/facturascripts/commit/93fc65ced3847a8e0837561e9fdfa0dbace2cfcb"
     },
-    {
-      "type": "WEB",
-      "url": "https://huntr.dev/bounties/7882a35a-b27e-4d7e-9fcc-e9e009d0b01c"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/neorazorx/facturascripts"
+    },
+    {
+      "type": "WEB",
+      "url": "https://huntr.dev/bounties/7882a35a-b27e-4d7e-9fcc-e9e009d0b01c"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2022/06/GHSA-w689-557m-2cvq/GHSA-w689-557m-2cvq.json b/advisories/github-reviewed/2022/06/GHSA-w689-557m-2cvq/GHSA-w689-557m-2cvq.json
index e8f314d6f25..ba3c90d74d0 100644
--- a/advisories/github-reviewed/2022/06/GHSA-w689-557m-2cvq/GHSA-w689-557m-2cvq.json
+++ b/advisories/github-reviewed/2022/06/GHSA-w689-557m-2cvq/GHSA-w689-557m-2cvq.json
@@ -48,13 +48,13 @@
       "type": "WEB",
       "url": "https://github.com/gogs/gogs/commit/7885f454a4946c4bbec1b4f8c603b5eea7429c7f"
     },
-    {
-      "type": "WEB",
-      "url": "https://huntr.dev/bounties/da1fbd6e-7a02-458e-9c2e-6d226c47046d"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/gogs/gogs"
+    },
+    {
+      "type": "WEB",
+      "url": "https://huntr.dev/bounties/da1fbd6e-7a02-458e-9c2e-6d226c47046d"
     }
   ],
   "database_specific": {