diff --git a/advisories/github-reviewed/2017/10/GHSA-333x-9vgq-v2j4/GHSA-333x-9vgq-v2j4.json b/advisories/github-reviewed/2017/10/GHSA-333x-9vgq-v2j4/GHSA-333x-9vgq-v2j4.json
index 118e53f5972..a62113423c7 100644
--- a/advisories/github-reviewed/2017/10/GHSA-333x-9vgq-v2j4/GHSA-333x-9vgq-v2j4.json
+++ b/advisories/github-reviewed/2017/10/GHSA-333x-9vgq-v2j4/GHSA-333x-9vgq-v2j4.json
@@ -53,6 +53,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-333x-9vgq-v2j4"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/geddy/geddy"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/geddy/geddy/releases/tag/v13.0.8"
@@ -64,10 +68,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/10"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/geddy/geddy"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-34r7-q49f-h37c/GHSA-34r7-q49f-h37c.json b/advisories/github-reviewed/2017/10/GHSA-34r7-q49f-h37c/GHSA-34r7-q49f-h37c.json
index 5c034238622..528a4f7ab42 100644
--- a/advisories/github-reviewed/2017/10/GHSA-34r7-q49f-h37c/GHSA-34r7-q49f-h37c.json
+++ b/advisories/github-reviewed/2017/10/GHSA-34r7-q49f-h37c/GHSA-34r7-q49f-h37c.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-34r7-q49f-h37c"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mishoo/UglifyJS2"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/39"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/96410"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/mishoo/UglifyJS2"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-3fx5-fwvr-xrjg/GHSA-3fx5-fwvr-xrjg.json b/advisories/github-reviewed/2017/10/GHSA-3fx5-fwvr-xrjg/GHSA-3fx5-fwvr-xrjg.json
index 15a7fbafc64..d60167c09bd 100644
--- a/advisories/github-reviewed/2017/10/GHSA-3fx5-fwvr-xrjg/GHSA-3fx5-fwvr-xrjg.json
+++ b/advisories/github-reviewed/2017/10/GHSA-3fx5-fwvr-xrjg/GHSA-3fx5-fwvr-xrjg.json
@@ -40,6 +40,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2015-8315"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/unshiftio/millisecond/"
+    },
     {
       "type": "WEB",
       "url": "https://support.f5.com/csp/article/K46337613?utm_source=f5support&utm_medium=RSS"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/96389"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/unshiftio/millisecond/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-3m6r-39p3-jq25/GHSA-3m6r-39p3-jq25.json b/advisories/github-reviewed/2017/10/GHSA-3m6r-39p3-jq25/GHSA-3m6r-39p3-jq25.json
index 85475e1c63e..8b85cabab45 100644
--- a/advisories/github-reviewed/2017/10/GHSA-3m6r-39p3-jq25/GHSA-3m6r-39p3-jq25.json
+++ b/advisories/github-reviewed/2017/10/GHSA-3m6r-39p3-jq25/GHSA-3m6r-39p3-jq25.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3m6r-39p3-jq25"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/doorkeeper-gem/doorkeeper/"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/doorkeeper-gem/doorkeeper/releases/tag/v4.2.0"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/92551"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/doorkeeper-gem/doorkeeper/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-3pxh-h8hw-mj8w/GHSA-3pxh-h8hw-mj8w.json b/advisories/github-reviewed/2017/10/GHSA-3pxh-h8hw-mj8w/GHSA-3pxh-h8hw-mj8w.json
index b40c1efa937..e50a6d21059 100644
--- a/advisories/github-reviewed/2017/10/GHSA-3pxh-h8hw-mj8w/GHSA-3pxh-h8hw-mj8w.json
+++ b/advisories/github-reviewed/2017/10/GHSA-3pxh-h8hw-mj8w/GHSA-3pxh-h8hw-mj8w.json
@@ -72,6 +72,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3pxh-h8hw-mj8w"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rack/rack"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/forum/#!topic/rack-devel/-MWPHDeGWtI"
@@ -99,10 +103,6 @@
     {
       "type": "WEB",
       "url": "http://www.debian.org/security/2013/dsa-2783"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rack/rack"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-4c4w-3q45-hp9j/GHSA-4c4w-3q45-hp9j.json b/advisories/github-reviewed/2017/10/GHSA-4c4w-3q45-hp9j/GHSA-4c4w-3q45-hp9j.json
index ef36408b2b6..9a9064d19f2 100644
--- a/advisories/github-reviewed/2017/10/GHSA-4c4w-3q45-hp9j/GHSA-4c4w-3q45-hp9j.json
+++ b/advisories/github-reviewed/2017/10/GHSA-4c4w-3q45-hp9j/GHSA-4c4w-3q45-hp9j.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/Gurpartap/aescrypt/issues/4"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Gurpartap/aescrypt/"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4c4w-3q45-hp9j"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/98035"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Gurpartap/aescrypt/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-4jm3-pfpf-h54p/GHSA-4jm3-pfpf-h54p.json b/advisories/github-reviewed/2017/10/GHSA-4jm3-pfpf-h54p/GHSA-4jm3-pfpf-h54p.json
index 596fdb346d7..ef541c40be2 100644
--- a/advisories/github-reviewed/2017/10/GHSA-4jm3-pfpf-h54p/GHSA-4jm3-pfpf-h54p.json
+++ b/advisories/github-reviewed/2017/10/GHSA-4jm3-pfpf-h54p/GHSA-4jm3-pfpf-h54p.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4jm3-pfpf-h54p"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/dejan/espeak-ruby"
+    },
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2017/01/31/14"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2017/02/02/5"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/dejan/espeak-ruby"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-4whc-pp4x-9pf3/GHSA-4whc-pp4x-9pf3.json b/advisories/github-reviewed/2017/10/GHSA-4whc-pp4x-9pf3/GHSA-4whc-pp4x-9pf3.json
index f8244cdff52..6555294771e 100644
--- a/advisories/github-reviewed/2017/10/GHSA-4whc-pp4x-9pf3/GHSA-4whc-pp4x-9pf3.json
+++ b/advisories/github-reviewed/2017/10/GHSA-4whc-pp4x-9pf3/GHSA-4whc-pp4x-9pf3.json
@@ -79,6 +79,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4whc-pp4x-9pf3"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rails/jquery-rails"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md"
@@ -110,10 +114,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/75239"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rails/jquery-rails"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-5726-g6r9-5f22/GHSA-5726-g6r9-5f22.json b/advisories/github-reviewed/2017/10/GHSA-5726-g6r9-5f22/GHSA-5726-g6r9-5f22.json
index d2bba694820..28bfdd231fa 100644
--- a/advisories/github-reviewed/2017/10/GHSA-5726-g6r9-5f22/GHSA-5726-g6r9-5f22.json
+++ b/advisories/github-reviewed/2017/10/GHSA-5726-g6r9-5f22/GHSA-5726-g6r9-5f22.json
@@ -53,6 +53,10 @@
       "type": "WEB",
       "url": "https://github.com/substack/node-browserify/blob/master/changelog.markdown#421"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/substack/node-syntax-error"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/syntax-error-potential-script-injection"
@@ -64,10 +68,6 @@
     {
       "type": "WEB",
       "url": "http://www-01.ibm.com/support/docview.wss?uid=swg21690815"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/substack/node-syntax-error"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-59c7-4xj2-hgvw/GHSA-59c7-4xj2-hgvw.json b/advisories/github-reviewed/2017/10/GHSA-59c7-4xj2-hgvw/GHSA-59c7-4xj2-hgvw.json
index 1781458e719..c03b6934ddb 100644
--- a/advisories/github-reviewed/2017/10/GHSA-59c7-4xj2-hgvw/GHSA-59c7-4xj2-hgvw.json
+++ b/advisories/github-reviewed/2017/10/GHSA-59c7-4xj2-hgvw/GHSA-59c7-4xj2-hgvw.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-59c7-4xj2-hgvw"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rails/rails-html-sanitizer/"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/forum/message/raw?msg=ruby-security-ann/uh--W4TDwmI/ygHE7hlZEgAJ"
@@ -79,10 +83,6 @@
     {
       "type": "WEB",
       "url": "http://www.securitytracker.com/id/1034816"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rails/rails-html-sanitizer/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-5j3g-jfq3-7jwx/GHSA-5j3g-jfq3-7jwx.json b/advisories/github-reviewed/2017/10/GHSA-5j3g-jfq3-7jwx/GHSA-5j3g-jfq3-7jwx.json
index 0a637a73021..d1a9bf22630 100644
--- a/advisories/github-reviewed/2017/10/GHSA-5j3g-jfq3-7jwx/GHSA-5j3g-jfq3-7jwx.json
+++ b/advisories/github-reviewed/2017/10/GHSA-5j3g-jfq3-7jwx/GHSA-5j3g-jfq3-7jwx.json
@@ -49,6 +49,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-5j3g-jfq3-7jwx"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/hapijs/bassmaster"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/bassmaster_js_injection"
@@ -68,10 +72,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/70180"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/hapijs/bassmaster"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-67j6-xv27-w6ww/GHSA-67j6-xv27-w6ww.json b/advisories/github-reviewed/2017/10/GHSA-67j6-xv27-w6ww/GHSA-67j6-xv27-w6ww.json
index f1160298d98..465509ab307 100644
--- a/advisories/github-reviewed/2017/10/GHSA-67j6-xv27-w6ww/GHSA-67j6-xv27-w6ww.json
+++ b/advisories/github-reviewed/2017/10/GHSA-67j6-xv27-w6ww/GHSA-67j6-xv27-w6ww.json
@@ -41,6 +41,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-67j6-xv27-w6ww"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rails/web-console"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/rails/web-console/blob/master/CHANGELOG.markdown"
@@ -60,10 +64,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/75237"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rails/web-console"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-6c8p-qphv-668v/GHSA-6c8p-qphv-668v.json b/advisories/github-reviewed/2017/10/GHSA-6c8p-qphv-668v/GHSA-6c8p-qphv-668v.json
index ada2bdddaa0..ef320f00d8f 100644
--- a/advisories/github-reviewed/2017/10/GHSA-6c8p-qphv-668v/GHSA-6c8p-qphv-668v.json
+++ b/advisories/github-reviewed/2017/10/GHSA-6c8p-qphv-668v/GHSA-6c8p-qphv-668v.json
@@ -53,6 +53,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6c8p-qphv-668v"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/openid/ruby-openid"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/openid/ruby-openid/blob/master/CHANGELOG.md"
@@ -68,10 +72,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2013/03/03/8"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/openid/ruby-openid"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-6h88-qjpv-p32m/GHSA-6h88-qjpv-p32m.json b/advisories/github-reviewed/2017/10/GHSA-6h88-qjpv-p32m/GHSA-6h88-qjpv-p32m.json
index b46c7481995..61782bd1091 100644
--- a/advisories/github-reviewed/2017/10/GHSA-6h88-qjpv-p32m/GHSA-6h88-qjpv-p32m.json
+++ b/advisories/github-reviewed/2017/10/GHSA-6h88-qjpv-p32m/GHSA-6h88-qjpv-p32m.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6h88-qjpv-p32m"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/ruby/openssl"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2018/07/msg00012.html"
@@ -75,10 +79,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/93031"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/ruby/openssl"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-6jvm-3j5h-79f6/GHSA-6jvm-3j5h-79f6.json b/advisories/github-reviewed/2017/10/GHSA-6jvm-3j5h-79f6/GHSA-6jvm-3j5h-79f6.json
index 8fbbecfbb66..1c072223bb7 100644
--- a/advisories/github-reviewed/2017/10/GHSA-6jvm-3j5h-79f6/GHSA-6jvm-3j5h-79f6.json
+++ b/advisories/github-reviewed/2017/10/GHSA-6jvm-3j5h-79f6/GHSA-6jvm-3j5h-79f6.json
@@ -45,6 +45,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6jvm-3j5h-79f6"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/thoughtbot/paperclip"
+    },
     {
       "type": "WEB",
       "url": "https://robots.thoughtbot.com/paperclip-security-release"
@@ -64,10 +68,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/75304"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/thoughtbot/paperclip"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-85r7-w5mv-c849/GHSA-85r7-w5mv-c849.json b/advisories/github-reviewed/2017/10/GHSA-85r7-w5mv-c849/GHSA-85r7-w5mv-c849.json
index 658e970b6e6..a68afce56a5 100644
--- a/advisories/github-reviewed/2017/10/GHSA-85r7-w5mv-c849/GHSA-85r7-w5mv-c849.json
+++ b/advisories/github-reviewed/2017/10/GHSA-85r7-w5mv-c849/GHSA-85r7-w5mv-c849.json
@@ -76,6 +76,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-85r7-w5mv-c849"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rack/rack"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/rack/rack/blob/master/lib/rack/file.rb#L56"
@@ -99,10 +103,6 @@
     {
       "type": "WEB",
       "url": "http://secunia.com/advisories/52033"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rack/rack"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-8jxj-9r5f-w3m2/GHSA-8jxj-9r5f-w3m2.json b/advisories/github-reviewed/2017/10/GHSA-8jxj-9r5f-w3m2/GHSA-8jxj-9r5f-w3m2.json
index e596ae622b8..c71a1f8aa64 100644
--- a/advisories/github-reviewed/2017/10/GHSA-8jxj-9r5f-w3m2/GHSA-8jxj-9r5f-w3m2.json
+++ b/advisories/github-reviewed/2017/10/GHSA-8jxj-9r5f-w3m2/GHSA-8jxj-9r5f-w3m2.json
@@ -49,6 +49,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8jxj-9r5f-w3m2"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/puppetlabs/puppet"
+    },
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-updates/2012-07/msg00036.html"
@@ -68,10 +72,6 @@
     {
       "type": "WEB",
       "url": "http://www.ubuntu.com/usn/USN-1506-1"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/puppetlabs/puppet"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-99ch-8mvp-g7m5/GHSA-99ch-8mvp-g7m5.json b/advisories/github-reviewed/2017/10/GHSA-99ch-8mvp-g7m5/GHSA-99ch-8mvp-g7m5.json
index 25a37c54939..17c14404889 100644
--- a/advisories/github-reviewed/2017/10/GHSA-99ch-8mvp-g7m5/GHSA-99ch-8mvp-g7m5.json
+++ b/advisories/github-reviewed/2017/10/GHSA-99ch-8mvp-g7m5/GHSA-99ch-8mvp-g7m5.json
@@ -45,6 +45,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-99ch-8mvp-g7m5"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rwestgeest/md2pdf"
+    },
     {
       "type": "WEB",
       "url": "http://osvdb.org/92290"
@@ -56,10 +60,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/59061"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rwestgeest/md2pdf"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-9fh3-vh3h-q4g3/GHSA-9fh3-vh3h-q4g3.json b/advisories/github-reviewed/2017/10/GHSA-9fh3-vh3h-q4g3/GHSA-9fh3-vh3h-q4g3.json
index 03ec5efd78c..e9bf2d943b9 100644
--- a/advisories/github-reviewed/2017/10/GHSA-9fh3-vh3h-q4g3/GHSA-9fh3-vh3h-q4g3.json
+++ b/advisories/github-reviewed/2017/10/GHSA-9fh3-vh3h-q4g3/GHSA-9fh3-vh3h-q4g3.json
@@ -68,6 +68,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-9fh3-vh3h-q4g3"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rails/rails"
+    },
     {
       "type": "WEB",
       "url": "http://groups.google.com/group/rubyonrails-security/msg/f1d2749773db9f21?dmode=source&output=gplain"
@@ -115,10 +119,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2011/08/22/5"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rails/rails"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-9p3v-wf2w-v29c/GHSA-9p3v-wf2w-v29c.json b/advisories/github-reviewed/2017/10/GHSA-9p3v-wf2w-v29c/GHSA-9p3v-wf2w-v29c.json
index b5a20fae757..fa9390101a3 100644
--- a/advisories/github-reviewed/2017/10/GHSA-9p3v-wf2w-v29c/GHSA-9p3v-wf2w-v29c.json
+++ b/advisories/github-reviewed/2017/10/GHSA-9p3v-wf2w-v29c/GHSA-9p3v-wf2w-v29c.json
@@ -60,6 +60,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-9p3v-wf2w-v29c"
     },
+    {
+      "type": "PACKAGE",
+      "url": "http://github.com/rails/rails"
+    },
     {
       "type": "WEB",
       "url": "http://github.com/rails/rails/commit/bfe032858077bb2946abe25e95e485ba6da86bd5"
@@ -119,10 +123,6 @@
     {
       "type": "WEB",
       "url": "http://www.vupen.com/english/advisories/2009/3352"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "http://github.com/rails/rails"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-9wrq-xvmp-xjc8/GHSA-9wrq-xvmp-xjc8.json b/advisories/github-reviewed/2017/10/GHSA-9wrq-xvmp-xjc8/GHSA-9wrq-xvmp-xjc8.json
index c8da1deab0e..d804574b4dd 100644
--- a/advisories/github-reviewed/2017/10/GHSA-9wrq-xvmp-xjc8/GHSA-9wrq-xvmp-xjc8.json
+++ b/advisories/github-reviewed/2017/10/GHSA-9wrq-xvmp-xjc8/GHSA-9wrq-xvmp-xjc8.json
@@ -45,6 +45,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-9wrq-xvmp-xjc8"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rails/rails"
+    },
     {
       "type": "WEB",
       "url": "http://secunia.com/advisories/21424"
@@ -84,10 +88,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/19454"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rails/rails"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-c43v-hrmg-56r4/GHSA-c43v-hrmg-56r4.json b/advisories/github-reviewed/2017/10/GHSA-c43v-hrmg-56r4/GHSA-c43v-hrmg-56r4.json
index 5ee6e08bb2a..792a920fcba 100644
--- a/advisories/github-reviewed/2017/10/GHSA-c43v-hrmg-56r4/GHSA-c43v-hrmg-56r4.json
+++ b/advisories/github-reviewed/2017/10/GHSA-c43v-hrmg-56r4/GHSA-c43v-hrmg-56r4.json
@@ -41,6 +41,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c43v-hrmg-56r4"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/thoughtbot/cocaine"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/thoughtbot/cocaine/blob/master/NEWS.md"
@@ -56,10 +60,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2013/10/22/10"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/thoughtbot/cocaine"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-c92m-rrrc-q5wf/GHSA-c92m-rrrc-q5wf.json b/advisories/github-reviewed/2017/10/GHSA-c92m-rrrc-q5wf/GHSA-c92m-rrrc-q5wf.json
index 49104aad209..992403ef989 100644
--- a/advisories/github-reviewed/2017/10/GHSA-c92m-rrrc-q5wf/GHSA-c92m-rrrc-q5wf.json
+++ b/advisories/github-reviewed/2017/10/GHSA-c92m-rrrc-q5wf/GHSA-c92m-rrrc-q5wf.json
@@ -56,6 +56,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c92m-rrrc-q5wf"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/svenfuchs/safemode"
+    },
     {
       "type": "WEB",
       "url": "http://projects.theforeman.org/issues/14635"
@@ -71,10 +75,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2016/04/20/8"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/svenfuchs/safemode"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-c9c5-9fpr-m882/GHSA-c9c5-9fpr-m882.json b/advisories/github-reviewed/2017/10/GHSA-c9c5-9fpr-m882/GHSA-c9c5-9fpr-m882.json
index 3bc7608a258..7d4354b892a 100644
--- a/advisories/github-reviewed/2017/10/GHSA-c9c5-9fpr-m882/GHSA-c9c5-9fpr-m882.json
+++ b/advisories/github-reviewed/2017/10/GHSA-c9c5-9fpr-m882/GHSA-c9c5-9fpr-m882.json
@@ -49,6 +49,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c9c5-9fpr-m882"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/getsentry/raven-ruby"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/forum/#!topic/getsentry/Cz5bih0ZY1U"
@@ -56,10 +60,6 @@
     {
       "type": "WEB",
       "url": "http://seclists.org/oss-sec/2015/q1/26"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/getsentry/raven-ruby"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/10/GHSA-w6rc-q387-vpgq/GHSA-w6rc-q387-vpgq.json b/advisories/github-reviewed/2017/10/GHSA-w6rc-q387-vpgq/GHSA-w6rc-q387-vpgq.json
index cf407e641aa..2f436b94b83 100644
--- a/advisories/github-reviewed/2017/10/GHSA-w6rc-q387-vpgq/GHSA-w6rc-q387-vpgq.json
+++ b/advisories/github-reviewed/2017/10/GHSA-w6rc-q387-vpgq/GHSA-w6rc-q387-vpgq.json
@@ -49,6 +49,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-w6rc-q387-vpgq"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/phusion/passenger"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/phusion/passenger/blob/release-4.0.6/NEWS"
@@ -60,10 +64,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2013/07/16/6"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/phusion/passenger"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/11/GHSA-5c8j-xr24-2665/GHSA-5c8j-xr24-2665.json b/advisories/github-reviewed/2017/11/GHSA-5c8j-xr24-2665/GHSA-5c8j-xr24-2665.json
index 7e241ecb430..b5299259053 100644
--- a/advisories/github-reviewed/2017/11/GHSA-5c8j-xr24-2665/GHSA-5c8j-xr24-2665.json
+++ b/advisories/github-reviewed/2017/11/GHSA-5c8j-xr24-2665/GHSA-5c8j-xr24-2665.json
@@ -51,6 +51,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-5c8j-xr24-2665"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/tojocky/node-printer"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/printer_potential_command_injection"
@@ -66,10 +70,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2014/05/15/2"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/tojocky/node-printer"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/11/GHSA-653m-r33x-39ff/GHSA-653m-r33x-39ff.json b/advisories/github-reviewed/2017/11/GHSA-653m-r33x-39ff/GHSA-653m-r33x-39ff.json
index 5b471436605..f1e6804b53e 100644
--- a/advisories/github-reviewed/2017/11/GHSA-653m-r33x-39ff/GHSA-653m-r33x-39ff.json
+++ b/advisories/github-reviewed/2017/11/GHSA-653m-r33x-39ff/GHSA-653m-r33x-39ff.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-653m-r33x-39ff"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/geminabox/geminabox"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/geminabox/geminabox/blob/master/CHANGELOG.md"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://rubygems.org/gems/geminabox/versions/0.13.10"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/geminabox/geminabox"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/11/GHSA-7qcx-jmrc-h2rr/GHSA-7qcx-jmrc-h2rr.json b/advisories/github-reviewed/2017/11/GHSA-7qcx-jmrc-h2rr/GHSA-7qcx-jmrc-h2rr.json
index 629cc381b0b..56dc52597f2 100644
--- a/advisories/github-reviewed/2017/11/GHSA-7qcx-jmrc-h2rr/GHSA-7qcx-jmrc-h2rr.json
+++ b/advisories/github-reviewed/2017/11/GHSA-7qcx-jmrc-h2rr/GHSA-7qcx-jmrc-h2rr.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7qcx-jmrc-h2rr"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/keystonejs/keystone"
+    },
     {
       "type": "WEB",
       "url": "https://packetstormsecurity.com/files/144756/KeystoneJS-4.0.0-beta.5-Unauthenticated-Stored-Cross-Site-Scripting.html"
@@ -71,10 +75,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/101541"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/keystonejs/keystone"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2017/12/GHSA-3f5c-4qxj-vmpf/GHSA-3f5c-4qxj-vmpf.json b/advisories/github-reviewed/2017/12/GHSA-3f5c-4qxj-vmpf/GHSA-3f5c-4qxj-vmpf.json
index 8418708fdc1..e9a4f06d0ad 100644
--- a/advisories/github-reviewed/2017/12/GHSA-3f5c-4qxj-vmpf/GHSA-3f5c-4qxj-vmpf.json
+++ b/advisories/github-reviewed/2017/12/GHSA-3f5c-4qxj-vmpf/GHSA-3f5c-4qxj-vmpf.json
@@ -44,13 +44,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3f5c-4qxj-vmpf"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/zeit/next.js/releases/tag/2.4.1"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/zeit/next.js"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/zeit/next.js/releases/tag/2.4.1"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/01/GHSA-7px7-7xjx-hxm8/GHSA-7px7-7xjx-hxm8.json b/advisories/github-reviewed/2018/01/GHSA-7px7-7xjx-hxm8/GHSA-7px7-7xjx-hxm8.json
index 2c94455bf46..610002b3a68 100644
--- a/advisories/github-reviewed/2018/01/GHSA-7px7-7xjx-hxm8/GHSA-7px7-7xjx-hxm8.json
+++ b/advisories/github-reviewed/2018/01/GHSA-7px7-7xjx-hxm8/GHSA-7px7-7xjx-hxm8.json
@@ -44,6 +44,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7px7-7xjx-hxm8"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/markedjs/marked"
+    },
     {
       "type": "WEB",
       "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/BO2RMVVZVV6NFTU46B5RYRK7ZCXYARZS/"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/npm:marked:20170112"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/markedjs/marked"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/01/GHSA-832h-xg76-4gv6/GHSA-832h-xg76-4gv6.json b/advisories/github-reviewed/2018/01/GHSA-832h-xg76-4gv6/GHSA-832h-xg76-4gv6.json
index 5a9dcd7d7b5..1ddc6aaf6d6 100644
--- a/advisories/github-reviewed/2018/01/GHSA-832h-xg76-4gv6/GHSA-832h-xg76-4gv6.json
+++ b/advisories/github-reviewed/2018/01/GHSA-832h-xg76-4gv6/GHSA-832h-xg76-4gv6.json
@@ -60,6 +60,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-832h-xg76-4gv6"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/juliangruber/brace-expansion"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/338"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/338"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/juliangruber/brace-expansion"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/01/GHSA-94cq-7ccq-cmcm/GHSA-94cq-7ccq-cmcm.json b/advisories/github-reviewed/2018/01/GHSA-94cq-7ccq-cmcm/GHSA-94cq-7ccq-cmcm.json
index deb6730ac1d..7d91609ac82 100644
--- a/advisories/github-reviewed/2018/01/GHSA-94cq-7ccq-cmcm/GHSA-94cq-7ccq-cmcm.json
+++ b/advisories/github-reviewed/2018/01/GHSA-94cq-7ccq-cmcm/GHSA-94cq-7ccq-cmcm.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-94cq-7ccq-cmcm"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/panthomakos/lynx"
+    },
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2014/07/07/23"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "http://www.vapid.dhs.org/advisories/lynx-0.2.0.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/panthomakos/lynx"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/01/GHSA-9pr6-grf4-x2fr/GHSA-9pr6-grf4-x2fr.json b/advisories/github-reviewed/2018/01/GHSA-9pr6-grf4-x2fr/GHSA-9pr6-grf4-x2fr.json
index 74f83fdeee2..6afb19738ce 100644
--- a/advisories/github-reviewed/2018/01/GHSA-9pr6-grf4-x2fr/GHSA-9pr6-grf4-x2fr.json
+++ b/advisories/github-reviewed/2018/01/GHSA-9pr6-grf4-x2fr/GHSA-9pr6-grf4-x2fr.json
@@ -56,13 +56,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-9pr6-grf4-x2fr"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.debian.org/security/2018/dsa-4109"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/omniauth/omniauth"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.debian.org/security/2018/dsa-4109"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/03/GHSA-325j-24f4-qv5x/GHSA-325j-24f4-qv5x.json b/advisories/github-reviewed/2018/03/GHSA-325j-24f4-qv5x/GHSA-325j-24f4-qv5x.json
index dec44648d2d..3e2f1162bdf 100644
--- a/advisories/github-reviewed/2018/03/GHSA-325j-24f4-qv5x/GHSA-325j-24f4-qv5x.json
+++ b/advisories/github-reviewed/2018/03/GHSA-325j-24f4-qv5x/GHSA-325j-24f4-qv5x.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-325j-24f4-qv5x"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/zkat/ssri"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/565"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/565"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/zkat/ssri"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/03/GHSA-446m-mv8f-q348/GHSA-446m-mv8f-q348.json b/advisories/github-reviewed/2018/03/GHSA-446m-mv8f-q348/GHSA-446m-mv8f-q348.json
index 8adca830415..44826149ec9 100644
--- a/advisories/github-reviewed/2018/03/GHSA-446m-mv8f-q348/GHSA-446m-mv8f-q348.json
+++ b/advisories/github-reviewed/2018/03/GHSA-446m-mv8f-q348/GHSA-446m-mv8f-q348.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-446m-mv8f-q348"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/moment/moment"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/532"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "https://www.tenable.com/security/tns-2019-02"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/moment/moment"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/03/GHSA-688c-3x49-6rqj/GHSA-688c-3x49-6rqj.json b/advisories/github-reviewed/2018/03/GHSA-688c-3x49-6rqj/GHSA-688c-3x49-6rqj.json
index ff282b9c0a6..7890dcdab41 100644
--- a/advisories/github-reviewed/2018/03/GHSA-688c-3x49-6rqj/GHSA-688c-3x49-6rqj.json
+++ b/advisories/github-reviewed/2018/03/GHSA-688c-3x49-6rqj/GHSA-688c-3x49-6rqj.json
@@ -56,13 +56,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-688c-3x49-6rqj"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.debian.org/security/2018/dsa-4247"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/sinatra/rack-protection"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.debian.org/security/2018/dsa-4247"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/03/GHSA-6x77-rpqf-j6mw/GHSA-6x77-rpqf-j6mw.json b/advisories/github-reviewed/2018/03/GHSA-6x77-rpqf-j6mw/GHSA-6x77-rpqf-j6mw.json
index a6e0dcda23f..394566146a5 100644
--- a/advisories/github-reviewed/2018/03/GHSA-6x77-rpqf-j6mw/GHSA-6x77-rpqf-j6mw.json
+++ b/advisories/github-reviewed/2018/03/GHSA-6x77-rpqf-j6mw/GHSA-6x77-rpqf-j6mw.json
@@ -48,13 +48,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6x77-rpqf-j6mw"
     },
-    {
-      "type": "WEB",
-      "url": "http://www.securityfocus.com/bid/101893"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/mde/ejs"
+    },
+    {
+      "type": "WEB",
+      "url": "http://www.securityfocus.com/bid/101893"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/03/GHSA-82gw-pqf7-q3j2/GHSA-82gw-pqf7-q3j2.json b/advisories/github-reviewed/2018/03/GHSA-82gw-pqf7-q3j2/GHSA-82gw-pqf7-q3j2.json
index dd2379b2ff1..32b9c2187a6 100644
--- a/advisories/github-reviewed/2018/03/GHSA-82gw-pqf7-q3j2/GHSA-82gw-pqf7-q3j2.json
+++ b/advisories/github-reviewed/2018/03/GHSA-82gw-pqf7-q3j2/GHSA-82gw-pqf7-q3j2.json
@@ -52,16 +52,12 @@
       "url": "https://github.com/advisories/GHSA-82gw-pqf7-q3j2"
     },
     {
-      "type": "WEB",
+      "type": "PACKAGE",
       "url": "https://github.com/nprapps/pym.js"
     },
     {
       "type": "WEB",
       "url": "http://blog.apps.npr.org/2018/02/15/pym-security-vulnerability.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/nprapps/pym.js"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-232r-66cg-79px/GHSA-232r-66cg-79px.json b/advisories/github-reviewed/2018/07/GHSA-232r-66cg-79px/GHSA-232r-66cg-79px.json
index 50205d99072..63b9fc3ce75 100644
--- a/advisories/github-reviewed/2018/07/GHSA-232r-66cg-79px/GHSA-232r-66cg-79px.json
+++ b/advisories/github-reviewed/2018/07/GHSA-232r-66cg-79px/GHSA-232r-66cg-79px.json
@@ -240,6 +240,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-232r-66cg-79px"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/paramiko/paramiko"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/paramiko/paramiko/blob/master/sites/www/changelog.rst"
@@ -267,10 +271,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/103713"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/paramiko/paramiko"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-2j9c-9vmv-7m39/GHSA-2j9c-9vmv-7m39.json b/advisories/github-reviewed/2018/07/GHSA-2j9c-9vmv-7m39/GHSA-2j9c-9vmv-7m39.json
index 633f5038989..fbd9631c726 100644
--- a/advisories/github-reviewed/2018/07/GHSA-2j9c-9vmv-7m39/GHSA-2j9c-9vmv-7m39.json
+++ b/advisories/github-reviewed/2018/07/GHSA-2j9c-9vmv-7m39/GHSA-2j9c-9vmv-7m39.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-2j9c-9vmv-7m39"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/cyu/rack-cors"
+    },
     {
       "type": "WEB",
       "url": "https://packetstormsecurity.com/files/143345/rack-cors-Missing-Anchor.html"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "http://www.debian.org/security/2017/dsa-3931"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/cyu/rack-cors"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-32pc-xphx-q4f6/GHSA-32pc-xphx-q4f6.json b/advisories/github-reviewed/2018/07/GHSA-32pc-xphx-q4f6/GHSA-32pc-xphx-q4f6.json
index 7a7eda44f4c..c3d3eff1a59 100644
--- a/advisories/github-reviewed/2018/07/GHSA-32pc-xphx-q4f6/GHSA-32pc-xphx-q4f6.json
+++ b/advisories/github-reviewed/2018/07/GHSA-32pc-xphx-q4f6/GHSA-32pc-xphx-q4f6.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-32pc-xphx-q4f6"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/benoitc/gunicorn"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2018/04/msg00022.html"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "https://www.debian.org/security/2018/dsa-4186"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/benoitc/gunicorn"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-3c5c-7235-994j/GHSA-3c5c-7235-994j.json b/advisories/github-reviewed/2018/07/GHSA-3c5c-7235-994j/GHSA-3c5c-7235-994j.json
index 33569e9f0d0..fcab8c1980c 100644
--- a/advisories/github-reviewed/2018/07/GHSA-3c5c-7235-994j/GHSA-3c5c-7235-994j.json
+++ b/advisories/github-reviewed/2018/07/GHSA-3c5c-7235-994j/GHSA-3c5c-7235-994j.json
@@ -56,6 +56,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3c5c-7235-994j"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/python-pillow/Pillow"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/python-pillow/Pillow/blob/c3cb690fed5d4bf0c45576759de55d054916c165/CHANGES.rst"
@@ -79,10 +83,6 @@
     {
       "type": "WEB",
       "url": "http://www.oracle.com/technetwork/topics/security/bulletinjan2016-2867206.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/python-pillow/Pillow"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-48vv-2pmq-9fvv/GHSA-48vv-2pmq-9fvv.json b/advisories/github-reviewed/2018/07/GHSA-48vv-2pmq-9fvv/GHSA-48vv-2pmq-9fvv.json
index 4aaee8e6f07..57a2e35af06 100644
--- a/advisories/github-reviewed/2018/07/GHSA-48vv-2pmq-9fvv/GHSA-48vv-2pmq-9fvv.json
+++ b/advisories/github-reviewed/2018/07/GHSA-48vv-2pmq-9fvv/GHSA-48vv-2pmq-9fvv.json
@@ -86,6 +86,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-48vv-2pmq-9fvv"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/plone/Products.CMFPlone"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/plone/Products.CMFPlone/blob/4.2.3/docs/CHANGES.txt"
@@ -101,10 +105,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2012/11/10/1"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/plone/Products.CMFPlone"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-5mc5-5j6c-qmf9/GHSA-5mc5-5j6c-qmf9.json b/advisories/github-reviewed/2018/07/GHSA-5mc5-5j6c-qmf9/GHSA-5mc5-5j6c-qmf9.json
index 26c0332ca4e..de20b907d0b 100644
--- a/advisories/github-reviewed/2018/07/GHSA-5mc5-5j6c-qmf9/GHSA-5mc5-5j6c-qmf9.json
+++ b/advisories/github-reviewed/2018/07/GHSA-5mc5-5j6c-qmf9/GHSA-5mc5-5j6c-qmf9.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/Anorov/cloudflare-scrape/issues/97"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Anorov/cloudflare-scrape"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/Anorov/cloudflare-scrape/releases/tag/1.8.0"
@@ -58,10 +62,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/97191"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Anorov/cloudflare-scrape"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-6528-wvf6-f6qg/GHSA-6528-wvf6-f6qg.json b/advisories/github-reviewed/2018/07/GHSA-6528-wvf6-f6qg/GHSA-6528-wvf6-f6qg.json
index 1a56fd6fcb8..79401ac9ee5 100644
--- a/advisories/github-reviewed/2018/07/GHSA-6528-wvf6-f6qg/GHSA-6528-wvf6-f6qg.json
+++ b/advisories/github-reviewed/2018/07/GHSA-6528-wvf6-f6qg/GHSA-6528-wvf6-f6qg.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6528-wvf6-f6qg"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/dlitz/pycrypto"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2018/02/msg00018.html"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "https://usn.ubuntu.com/3616-2/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/dlitz/pycrypto"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-6mww-xvh7-fq4f/GHSA-6mww-xvh7-fq4f.json b/advisories/github-reviewed/2018/07/GHSA-6mww-xvh7-fq4f/GHSA-6mww-xvh7-fq4f.json
index f2f72908d6a..8e7829a5d8a 100644
--- a/advisories/github-reviewed/2018/07/GHSA-6mww-xvh7-fq4f/GHSA-6mww-xvh7-fq4f.json
+++ b/advisories/github-reviewed/2018/07/GHSA-6mww-xvh7-fq4f/GHSA-6mww-xvh7-fq4f.json
@@ -133,6 +133,10 @@
       "type": "WEB",
       "url": "https://docs.pagure.org/koji/CVE-2018-1002150/"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://pagure.io/koji"
+    },
     {
       "type": "WEB",
       "url": "https://pagure.io/koji/c/ab1ade7"
@@ -140,10 +144,6 @@
     {
       "type": "WEB",
       "url": "https://pagure.io/koji/issue/850"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://pagure.io/koji"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-73jp-3c67-hjfv/GHSA-73jp-3c67-hjfv.json b/advisories/github-reviewed/2018/07/GHSA-73jp-3c67-hjfv/GHSA-73jp-3c67-hjfv.json
index 7649e4f403a..d8d23cb9fb6 100644
--- a/advisories/github-reviewed/2018/07/GHSA-73jp-3c67-hjfv/GHSA-73jp-3c67-hjfv.json
+++ b/advisories/github-reviewed/2018/07/GHSA-73jp-3c67-hjfv/GHSA-73jp-3c67-hjfv.json
@@ -62,6 +62,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2016-7191"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/AzureAD/passport-azure-ad"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/AzureAD/passport-azure-ad/blob/master/SECURITY-NOTICE.MD"
@@ -89,10 +93,6 @@
     {
       "type": "WEB",
       "url": "http://www.securitytracker.com/id/1036996"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/AzureAD/passport-azure-ad"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-7wph-fc4w-wqp2/GHSA-7wph-fc4w-wqp2.json b/advisories/github-reviewed/2018/07/GHSA-7wph-fc4w-wqp2/GHSA-7wph-fc4w-wqp2.json
index 13e39c4a6c8..5066ea7d00d 100644
--- a/advisories/github-reviewed/2018/07/GHSA-7wph-fc4w-wqp2/GHSA-7wph-fc4w-wqp2.json
+++ b/advisories/github-reviewed/2018/07/GHSA-7wph-fc4w-wqp2/GHSA-7wph-fc4w-wqp2.json
@@ -64,6 +64,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7wph-fc4w-wqp2"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/django/django"
+    },
     {
       "type": "WEB",
       "url": "http://code.djangoproject.com/changeset/15032"
@@ -115,10 +119,6 @@
     {
       "type": "WEB",
       "url": "http://www.vupen.com/english/advisories/2011/0098"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/django/django"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-8g7p-74h8-hg48/GHSA-8g7p-74h8-hg48.json b/advisories/github-reviewed/2018/07/GHSA-8g7p-74h8-hg48/GHSA-8g7p-74h8-hg48.json
index dcdc4997474..7b36c1fac34 100644
--- a/advisories/github-reviewed/2018/07/GHSA-8g7p-74h8-hg48/GHSA-8g7p-74h8-hg48.json
+++ b/advisories/github-reviewed/2018/07/GHSA-8g7p-74h8-hg48/GHSA-8g7p-74h8-hg48.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://hackerone.com/reports/319532"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/TooTallNate/node-https-proxy-agent"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8g7p-74h8-hg48"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/593"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/TooTallNate/node-https-proxy-agent"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-8m3r-rv5g-fcpq/GHSA-8m3r-rv5g-fcpq.json b/advisories/github-reviewed/2018/07/GHSA-8m3r-rv5g-fcpq/GHSA-8m3r-rv5g-fcpq.json
index e5602e857c5..49521cc3f40 100644
--- a/advisories/github-reviewed/2018/07/GHSA-8m3r-rv5g-fcpq/GHSA-8m3r-rv5g-fcpq.json
+++ b/advisories/github-reviewed/2018/07/GHSA-8m3r-rv5g-fcpq/GHSA-8m3r-rv5g-fcpq.json
@@ -64,6 +64,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8m3r-rv5g-fcpq"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/django/django"
+    },
     {
       "type": "WEB",
       "url": "http://lists.fedoraproject.org/pipermail/package-announce/2011-February/054207.html"
@@ -131,10 +135,6 @@
     {
       "type": "WEB",
       "url": "http://www.vupen.com/english/advisories/2011/0441"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/django/django"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-8p5c-f328-9fvv/GHSA-8p5c-f328-9fvv.json b/advisories/github-reviewed/2018/07/GHSA-8p5c-f328-9fvv/GHSA-8p5c-f328-9fvv.json
index ad7faef29e3..d5e2a8d1ffd 100644
--- a/advisories/github-reviewed/2018/07/GHSA-8p5c-f328-9fvv/GHSA-8p5c-f328-9fvv.json
+++ b/advisories/github-reviewed/2018/07/GHSA-8p5c-f328-9fvv/GHSA-8p5c-f328-9fvv.json
@@ -55,13 +55,13 @@
       "type": "WEB",
       "url": "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854723"
     },
-    {
-      "type": "WEB",
-      "url": "https://security-tracker.debian.org/tracker/CVE-2017-0359"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/anthraxx/diffoscope"
+    },
+    {
+      "type": "WEB",
+      "url": "https://security-tracker.debian.org/tracker/CVE-2017-0359"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-8xjv-v9xq-m5h9/GHSA-8xjv-v9xq-m5h9.json b/advisories/github-reviewed/2018/07/GHSA-8xjv-v9xq-m5h9/GHSA-8xjv-v9xq-m5h9.json
index 74229a63d8d..b66451e377d 100644
--- a/advisories/github-reviewed/2018/07/GHSA-8xjv-v9xq-m5h9/GHSA-8xjv-v9xq-m5h9.json
+++ b/advisories/github-reviewed/2018/07/GHSA-8xjv-v9xq-m5h9/GHSA-8xjv-v9xq-m5h9.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8xjv-v9xq-m5h9"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/python-pillow/Pillow"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/python-pillow/Pillow/blob/c3cb690fed5d4bf0c45576759de55d054916c165/CHANGES.rst"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "http://www.debian.org/security/2016/dsa-3499"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/python-pillow/Pillow"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-924m-4pmx-c67h/GHSA-924m-4pmx-c67h.json b/advisories/github-reviewed/2018/07/GHSA-924m-4pmx-c67h/GHSA-924m-4pmx-c67h.json
index 42c46ada4fc..5dbabe18b8b 100644
--- a/advisories/github-reviewed/2018/07/GHSA-924m-4pmx-c67h/GHSA-924m-4pmx-c67h.json
+++ b/advisories/github-reviewed/2018/07/GHSA-924m-4pmx-c67h/GHSA-924m-4pmx-c67h.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-924m-4pmx-c67h"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rohe/pysaml2"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2018/07/msg00000.html"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "https://security.gentoo.org/glsa/201801-11"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rohe/pysaml2"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-c2vx-49jm-h3f6/GHSA-c2vx-49jm-h3f6.json b/advisories/github-reviewed/2018/07/GHSA-c2vx-49jm-h3f6/GHSA-c2vx-49jm-h3f6.json
index c384e6e704c..8db76954abc 100644
--- a/advisories/github-reviewed/2018/07/GHSA-c2vx-49jm-h3f6/GHSA-c2vx-49jm-h3f6.json
+++ b/advisories/github-reviewed/2018/07/GHSA-c2vx-49jm-h3f6/GHSA-c2vx-49jm-h3f6.json
@@ -75,6 +75,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c2vx-49jm-h3f6"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rohe/pysaml2"
+    },
     {
       "type": "WEB",
       "url": "http://www.debian.org/security/2017/dsa-3759"
@@ -86,10 +90,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/97692"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rohe/pysaml2"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-c2w9-48qc-qpj4/GHSA-c2w9-48qc-qpj4.json b/advisories/github-reviewed/2018/07/GHSA-c2w9-48qc-qpj4/GHSA-c2w9-48qc-qpj4.json
index 80a672b51e6..99b8a5e8e42 100644
--- a/advisories/github-reviewed/2018/07/GHSA-c2w9-48qc-qpj4/GHSA-c2w9-48qc-qpj4.json
+++ b/advisories/github-reviewed/2018/07/GHSA-c2w9-48qc-qpj4/GHSA-c2w9-48qc-qpj4.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c2w9-48qc-qpj4"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/tomoh1r/ansible-vault"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/tomoh1r/ansible-vault/blob/v1.0.5/CHANGES.txt"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/100824"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/tomoh1r/ansible-vault"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/07/GHSA-ccmq-qvcp-5mrm/GHSA-ccmq-qvcp-5mrm.json b/advisories/github-reviewed/2018/07/GHSA-ccmq-qvcp-5mrm/GHSA-ccmq-qvcp-5mrm.json
index 87a913f5f03..c05b3002b7c 100644
--- a/advisories/github-reviewed/2018/07/GHSA-ccmq-qvcp-5mrm/GHSA-ccmq-qvcp-5mrm.json
+++ b/advisories/github-reviewed/2018/07/GHSA-ccmq-qvcp-5mrm/GHSA-ccmq-qvcp-5mrm.json
@@ -58,13 +58,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-ccmq-qvcp-5mrm"
     },
-    {
-      "type": "WEB",
-      "url": "https://joel-malwarebenchmark.github.io/blog/2017/11/08/cve-2017-16618-convert-through-owlmixin/"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/tadashi-aikawa/owlmixin"
+    },
+    {
+      "type": "WEB",
+      "url": "https://joel-malwarebenchmark.github.io/blog/2017/11/08/cve-2017-16618-convert-through-owlmixin/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/08/GHSA-22gq-x6pg-752j/GHSA-22gq-x6pg-752j.json b/advisories/github-reviewed/2018/08/GHSA-22gq-x6pg-752j/GHSA-22gq-x6pg-752j.json
index 94eaf67ed2a..e459c05690f 100644
--- a/advisories/github-reviewed/2018/08/GHSA-22gq-x6pg-752j/GHSA-22gq-x6pg-752j.json
+++ b/advisories/github-reviewed/2018/08/GHSA-22gq-x6pg-752j/GHSA-22gq-x6pg-752j.json
@@ -34,6 +34,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2017-16065"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/DigitalArsenal/openssl.js"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/504"
@@ -41,10 +45,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/504"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/DigitalArsenal/openssl.js"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/08/GHSA-2hxv-mx8x-mcj9/GHSA-2hxv-mx8x-mcj9.json b/advisories/github-reviewed/2018/08/GHSA-2hxv-mx8x-mcj9/GHSA-2hxv-mx8x-mcj9.json
index 9808a0aa2ac..008b3a63ac0 100644
--- a/advisories/github-reviewed/2018/08/GHSA-2hxv-mx8x-mcj9/GHSA-2hxv-mx8x-mcj9.json
+++ b/advisories/github-reviewed/2018/08/GHSA-2hxv-mx8x-mcj9/GHSA-2hxv-mx8x-mcj9.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-2hxv-mx8x-mcj9"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/denkGroot/Spina"
+    },
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2015/06/16/20"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/75216"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/denkGroot/Spina"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/08/GHSA-4j59-hfw6-6w7h/GHSA-4j59-hfw6-6w7h.json b/advisories/github-reviewed/2018/08/GHSA-4j59-hfw6-6w7h/GHSA-4j59-hfw6-6w7h.json
index ecb8d49ac9d..63fbfdb6af5 100644
--- a/advisories/github-reviewed/2018/08/GHSA-4j59-hfw6-6w7h/GHSA-4j59-hfw6-6w7h.json
+++ b/advisories/github-reviewed/2018/08/GHSA-4j59-hfw6-6w7h/GHSA-4j59-hfw6-6w7h.json
@@ -41,6 +41,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4j59-hfw6-6w7h"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/stanley-gu/cmake"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/233"
@@ -48,10 +52,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/233"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/stanley-gu/cmake"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/08/GHSA-7322-9mx6-5j2m/GHSA-7322-9mx6-5j2m.json b/advisories/github-reviewed/2018/08/GHSA-7322-9mx6-5j2m/GHSA-7322-9mx6-5j2m.json
index 4e8613e501f..6f0722d58c5 100644
--- a/advisories/github-reviewed/2018/08/GHSA-7322-9mx6-5j2m/GHSA-7322-9mx6-5j2m.json
+++ b/advisories/github-reviewed/2018/08/GHSA-7322-9mx6-5j2m/GHSA-7322-9mx6-5j2m.json
@@ -41,6 +41,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7322-9mx6-5j2m"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/vmg/redcarpet"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md"
@@ -56,10 +60,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/75508"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/vmg/redcarpet"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/08/GHSA-8gg6-3r63-25m8/GHSA-8gg6-3r63-25m8.json b/advisories/github-reviewed/2018/08/GHSA-8gg6-3r63-25m8/GHSA-8gg6-3r63-25m8.json
index 5b3bcce977a..4730f6a5d50 100644
--- a/advisories/github-reviewed/2018/08/GHSA-8gg6-3r63-25m8/GHSA-8gg6-3r63-25m8.json
+++ b/advisories/github-reviewed/2018/08/GHSA-8gg6-3r63-25m8/GHSA-8gg6-3r63-25m8.json
@@ -52,13 +52,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8gg6-3r63-25m8"
     },
-    {
-      "type": "WEB",
-      "url": "http://www.securityfocus.com/bid/81433"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/square/git-fastclone"
+    },
+    {
+      "type": "WEB",
+      "url": "http://www.securityfocus.com/bid/81433"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/08/GHSA-8wg9-92fr-6j7v/GHSA-8wg9-92fr-6j7v.json b/advisories/github-reviewed/2018/08/GHSA-8wg9-92fr-6j7v/GHSA-8wg9-92fr-6j7v.json
index 5522ef33b56..7ee6710d9af 100644
--- a/advisories/github-reviewed/2018/08/GHSA-8wg9-92fr-6j7v/GHSA-8wg9-92fr-6j7v.json
+++ b/advisories/github-reviewed/2018/08/GHSA-8wg9-92fr-6j7v/GHSA-8wg9-92fr-6j7v.json
@@ -41,6 +41,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8wg9-92fr-6j7v"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mozilla-b2g/marionette-socket-host"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/252"
@@ -48,10 +52,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/252"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/mozilla-b2g/marionette-socket-host"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-4xjh-m3qx-49wc/GHSA-4xjh-m3qx-49wc.json b/advisories/github-reviewed/2018/09/GHSA-4xjh-m3qx-49wc/GHSA-4xjh-m3qx-49wc.json
index ad6ced07ced..0bafa3d1d24 100644
--- a/advisories/github-reviewed/2018/09/GHSA-4xjh-m3qx-49wc/GHSA-4xjh-m3qx-49wc.json
+++ b/advisories/github-reviewed/2018/09/GHSA-4xjh-m3qx-49wc/GHSA-4xjh-m3qx-49wc.json
@@ -86,6 +86,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4xjh-m3qx-49wc"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/jekyll/jekyll/"
+    },
     {
       "type": "WEB",
       "url": "https://jekyllrb.com/news/2018/09/19/security-fixes-for-3-6-3-7-3-8/"
@@ -93,10 +97,6 @@
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/71da391f584b2fb301d2df0e491b279d87287e2fb4b11309f04ad984@%3Ccommits.accumulo.apache.org%3E"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/jekyll/jekyll/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-5h6m-9mvx-m6c5/GHSA-5h6m-9mvx-m6c5.json b/advisories/github-reviewed/2018/09/GHSA-5h6m-9mvx-m6c5/GHSA-5h6m-9mvx-m6c5.json
index 5c3635b139c..30318a91677 100644
--- a/advisories/github-reviewed/2018/09/GHSA-5h6m-9mvx-m6c5/GHSA-5h6m-9mvx-m6c5.json
+++ b/advisories/github-reviewed/2018/09/GHSA-5h6m-9mvx-m6c5/GHSA-5h6m-9mvx-m6c5.json
@@ -44,6 +44,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-5h6m-9mvx-m6c5"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://gitlab.com/mayan-edms/mayan-edms"
+    },
     {
       "type": "WEB",
       "url": "https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://gitlab.com/mayan-edms/mayan-edms/issues/496"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://gitlab.com/mayan-edms/mayan-edms"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-5r76-cjf4-c9qx/GHSA-5r76-cjf4-c9qx.json b/advisories/github-reviewed/2018/09/GHSA-5r76-cjf4-c9qx/GHSA-5r76-cjf4-c9qx.json
index 4d287d73e06..1c997e545dc 100644
--- a/advisories/github-reviewed/2018/09/GHSA-5r76-cjf4-c9qx/GHSA-5r76-cjf4-c9qx.json
+++ b/advisories/github-reviewed/2018/09/GHSA-5r76-cjf4-c9qx/GHSA-5r76-cjf4-c9qx.json
@@ -44,6 +44,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-5r76-cjf4-c9qx"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://gitlab.com/mayan-edms/mayan-edms"
+    },
     {
       "type": "WEB",
       "url": "https://gitlab.com/mayan-edms/mayan-edms/blob/master/HISTORY.rst"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://gitlab.com/mayan-edms/mayan-edms/issues/495"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://gitlab.com/mayan-edms/mayan-edms"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-685w-vc84-wxcx/GHSA-685w-vc84-wxcx.json b/advisories/github-reviewed/2018/09/GHSA-685w-vc84-wxcx/GHSA-685w-vc84-wxcx.json
index de3f75bc56b..8a85a55af6d 100644
--- a/advisories/github-reviewed/2018/09/GHSA-685w-vc84-wxcx/GHSA-685w-vc84-wxcx.json
+++ b/advisories/github-reviewed/2018/09/GHSA-685w-vc84-wxcx/GHSA-685w-vc84-wxcx.json
@@ -45,6 +45,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-685w-vc84-wxcx"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/doorkeeper-gem/doorkeeper"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md"
@@ -52,10 +56,6 @@
     {
       "type": "WEB",
       "url": "http://seclists.org/oss-sec/2014/q4/1076"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/doorkeeper-gem/doorkeeper"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-6g87-ff9q-v847/GHSA-6g87-ff9q-v847.json b/advisories/github-reviewed/2018/09/GHSA-6g87-ff9q-v847/GHSA-6g87-ff9q-v847.json
index 1197e891668..05f5d06dd29 100644
--- a/advisories/github-reviewed/2018/09/GHSA-6g87-ff9q-v847/GHSA-6g87-ff9q-v847.json
+++ b/advisories/github-reviewed/2018/09/GHSA-6g87-ff9q-v847/GHSA-6g87-ff9q-v847.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/aaugustin/websockets/pull/407"
     },
-    {
-      "type": "ADVISORY",
-      "url": "https://github.com/advisories/GHSA-6g87-ff9q-v847"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/aaugustin/websockets"
+    },
+    {
+      "type": "ADVISORY",
+      "url": "https://github.com/advisories/GHSA-6g87-ff9q-v847"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-7375-vjr2-3g7w/GHSA-7375-vjr2-3g7w.json b/advisories/github-reviewed/2018/09/GHSA-7375-vjr2-3g7w/GHSA-7375-vjr2-3g7w.json
index 91bb3d9b6ff..6660b802efa 100644
--- a/advisories/github-reviewed/2018/09/GHSA-7375-vjr2-3g7w/GHSA-7375-vjr2-3g7w.json
+++ b/advisories/github-reviewed/2018/09/GHSA-7375-vjr2-3g7w/GHSA-7375-vjr2-3g7w.json
@@ -52,13 +52,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7375-vjr2-3g7w"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/610"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/jarofghosts/glance"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/610"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-8462-q7x7-g2x4/GHSA-8462-q7x7-g2x4.json b/advisories/github-reviewed/2018/09/GHSA-8462-q7x7-g2x4/GHSA-8462-q7x7-g2x4.json
index 5de1289f0b3..e533840daa0 100644
--- a/advisories/github-reviewed/2018/09/GHSA-8462-q7x7-g2x4/GHSA-8462-q7x7-g2x4.json
+++ b/advisories/github-reviewed/2018/09/GHSA-8462-q7x7-g2x4/GHSA-8462-q7x7-g2x4.json
@@ -48,13 +48,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8462-q7x7-g2x4"
     },
-    {
-      "type": "WEB",
-      "url": "https://snyk.io/vuln/npm:bson:20180225"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/mongodb/js-bson"
+    },
+    {
+      "type": "WEB",
+      "url": "https://snyk.io/vuln/npm:bson:20180225"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/09/GHSA-c2vr-2c89-ph88/GHSA-c2vr-2c89-ph88.json b/advisories/github-reviewed/2018/09/GHSA-c2vr-2c89-ph88/GHSA-c2vr-2c89-ph88.json
index bedfddd5618..324830bd48b 100644
--- a/advisories/github-reviewed/2018/09/GHSA-c2vr-2c89-ph88/GHSA-c2vr-2c89-ph88.json
+++ b/advisories/github-reviewed/2018/09/GHSA-c2vr-2c89-ph88/GHSA-c2vr-2c89-ph88.json
@@ -41,6 +41,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c2vr-2c89-ph88"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/arthur-zhang/node-bsdiff-android"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/234"
@@ -48,10 +52,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/234"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/arthur-zhang/node-bsdiff-android"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-2mp8-qvqm-3xwq/GHSA-2mp8-qvqm-3xwq.json b/advisories/github-reviewed/2018/10/GHSA-2mp8-qvqm-3xwq/GHSA-2mp8-qvqm-3xwq.json
index 112c4a8f463..a20e4fb7116 100644
--- a/advisories/github-reviewed/2018/10/GHSA-2mp8-qvqm-3xwq/GHSA-2mp8-qvqm-3xwq.json
+++ b/advisories/github-reviewed/2018/10/GHSA-2mp8-qvqm-3xwq/GHSA-2mp8-qvqm-3xwq.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-2mp8-qvqm-3xwq"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/restlet/restlet-framework-java"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/restlet/restlet-framework-java/wiki/XEE-security-enhancements"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://lgtm.com/blog/restlet_CVE-2017-14868"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/restlet/restlet-framework-java"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-2rcm-phc9-3945/GHSA-2rcm-phc9-3945.json b/advisories/github-reviewed/2018/10/GHSA-2rcm-phc9-3945/GHSA-2rcm-phc9-3945.json
index b0ed7f8770c..5e923ffe2d4 100644
--- a/advisories/github-reviewed/2018/10/GHSA-2rcm-phc9-3945/GHSA-2rcm-phc9-3945.json
+++ b/advisories/github-reviewed/2018/10/GHSA-2rcm-phc9-3945/GHSA-2rcm-phc9-3945.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-2rcm-phc9-3945"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/pyca/pyopenssl"
+    },
     {
       "type": "WEB",
       "url": "https://usn.ubuntu.com/3813-1/"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2019-04/msg00014.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/pyca/pyopenssl"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-37q6-576q-vgr7/GHSA-37q6-576q-vgr7.json b/advisories/github-reviewed/2018/10/GHSA-37q6-576q-vgr7/GHSA-37q6-576q-vgr7.json
index a3ddda1d4f6..382bcc53c0a 100644
--- a/advisories/github-reviewed/2018/10/GHSA-37q6-576q-vgr7/GHSA-37q6-576q-vgr7.json
+++ b/advisories/github-reviewed/2018/10/GHSA-37q6-576q-vgr7/GHSA-37q6-576q-vgr7.json
@@ -64,13 +64,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-37q6-576q-vgr7"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/721"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/parcel-bundler/parcel"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/721"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-4446-656p-f54g/GHSA-4446-656p-f54g.json b/advisories/github-reviewed/2018/10/GHSA-4446-656p-f54g/GHSA-4446-656p-f54g.json
index ea8bf62ec47..5eda8035e36 100644
--- a/advisories/github-reviewed/2018/10/GHSA-4446-656p-f54g/GHSA-4446-656p-f54g.json
+++ b/advisories/github-reviewed/2018/10/GHSA-4446-656p-f54g/GHSA-4446-656p-f54g.json
@@ -71,6 +71,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4446-656p-f54g"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/bcgit/bc-java"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/rf1bbc0ea4a9f014cf94df9a12a6477d24a27f52741dbc87f2fd52ff2@%3Cissues.geode.apache.org%3E"
@@ -106,10 +110,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2020-05/msg00011.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/bcgit/bc-java"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-45xm-v8gq-7jqx/GHSA-45xm-v8gq-7jqx.json b/advisories/github-reviewed/2018/10/GHSA-45xm-v8gq-7jqx/GHSA-45xm-v8gq-7jqx.json
index 13ef368cafa..9db1f3f2094 100644
--- a/advisories/github-reviewed/2018/10/GHSA-45xm-v8gq-7jqx/GHSA-45xm-v8gq-7jqx.json
+++ b/advisories/github-reviewed/2018/10/GHSA-45xm-v8gq-7jqx/GHSA-45xm-v8gq-7jqx.json
@@ -56,6 +56,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-45xm-v8gq-7jqx"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/eclipse-vertx/vert.x"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/r01123837ffbfdf5809e0a4ac354ad546e4ca8f18df89ee5a10eeb81b@%3Cissues.bookkeeper.apache.org%3E"
@@ -107,10 +111,6 @@
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/reb3cc4f3e10264896a541813c0030ec9d9466ba9b722fe5d4adc91cd@%3Cissues.bookkeeper.apache.org%3E"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/eclipse-vertx/vert.x"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-4r64-wf76-c53p/GHSA-4r64-wf76-c53p.json b/advisories/github-reviewed/2018/10/GHSA-4r64-wf76-c53p/GHSA-4r64-wf76-c53p.json
index 99bdcab8645..aa8a721e5a0 100644
--- a/advisories/github-reviewed/2018/10/GHSA-4r64-wf76-c53p/GHSA-4r64-wf76-c53p.json
+++ b/advisories/github-reviewed/2018/10/GHSA-4r64-wf76-c53p/GHSA-4r64-wf76-c53p.json
@@ -48,13 +48,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4r64-wf76-c53p"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/blynkkk/blynk-server/releases/tag/v0.39.7"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/blynkkk/blynk-server"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/blynkkk/blynk-server/releases/tag/v0.39.7"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-4vhj-98r6-424h/GHSA-4vhj-98r6-424h.json b/advisories/github-reviewed/2018/10/GHSA-4vhj-98r6-424h/GHSA-4vhj-98r6-424h.json
index a16f1f3f8ac..06920ff1af3 100644
--- a/advisories/github-reviewed/2018/10/GHSA-4vhj-98r6-424h/GHSA-4vhj-98r6-424h.json
+++ b/advisories/github-reviewed/2018/10/GHSA-4vhj-98r6-424h/GHSA-4vhj-98r6-424h.json
@@ -75,6 +75,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4vhj-98r6-424h"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/bcgit/bc-java"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/708d94141126eac03011144a971a6411fcac16d9c248d1d535a39451@%3Csolr-user.lucene.apache.org%3E"
@@ -90,10 +94,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2020.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/bcgit/bc-java"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-683w-6h9j-57wq/GHSA-683w-6h9j-57wq.json b/advisories/github-reviewed/2018/10/GHSA-683w-6h9j-57wq/GHSA-683w-6h9j-57wq.json
index f51f6a4ee51..61ebc492675 100644
--- a/advisories/github-reviewed/2018/10/GHSA-683w-6h9j-57wq/GHSA-683w-6h9j-57wq.json
+++ b/advisories/github-reviewed/2018/10/GHSA-683w-6h9j-57wq/GHSA-683w-6h9j-57wq.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-683w-6h9j-57wq"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/nahsra/antisamy"
+    },
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/95101"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "http://www.securitytracker.com/id/1037532"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/nahsra/antisamy"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-6fvx-r7hx-3vh6/GHSA-6fvx-r7hx-3vh6.json b/advisories/github-reviewed/2018/10/GHSA-6fvx-r7hx-3vh6/GHSA-6fvx-r7hx-3vh6.json
index a8921343d9e..c32cf339655 100644
--- a/advisories/github-reviewed/2018/10/GHSA-6fvx-r7hx-3vh6/GHSA-6fvx-r7hx-3vh6.json
+++ b/advisories/github-reviewed/2018/10/GHSA-6fvx-r7hx-3vh6/GHSA-6fvx-r7hx-3vh6.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6fvx-r7hx-3vh6"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/javamelody/javamelody"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/javamelody/javamelody/wiki/ReleaseNotes"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2018/09/25/3"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/javamelody/javamelody"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-6pcc-3rfx-4gpm/GHSA-6pcc-3rfx-4gpm.json b/advisories/github-reviewed/2018/10/GHSA-6pcc-3rfx-4gpm/GHSA-6pcc-3rfx-4gpm.json
index bc3078dd027..199e0f80bc3 100644
--- a/advisories/github-reviewed/2018/10/GHSA-6pcc-3rfx-4gpm/GHSA-6pcc-3rfx-4gpm.json
+++ b/advisories/github-reviewed/2018/10/GHSA-6pcc-3rfx-4gpm/GHSA-6pcc-3rfx-4gpm.json
@@ -133,6 +133,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6pcc-3rfx-4gpm"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/dom4j/dom4j/"
+    },
     {
       "type": "WEB",
       "url": "https://ihacktoprotect.com/post/dom4j-xml-injection/"
@@ -204,10 +208,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/technetwork/security-advisory/cpujan2019-5072801.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/dom4j/dom4j/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-73cq-fhp3-8rpw/GHSA-73cq-fhp3-8rpw.json b/advisories/github-reviewed/2018/10/GHSA-73cq-fhp3-8rpw/GHSA-73cq-fhp3-8rpw.json
index af0934ddee3..cef6b1b016b 100644
--- a/advisories/github-reviewed/2018/10/GHSA-73cq-fhp3-8rpw/GHSA-73cq-fhp3-8rpw.json
+++ b/advisories/github-reviewed/2018/10/GHSA-73cq-fhp3-8rpw/GHSA-73cq-fhp3-8rpw.json
@@ -45,6 +45,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-73cq-fhp3-8rpw"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/restlet/restlet-framework-java"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/restlet/restlet-framework-java/wiki/XEE-security-enhancements"
@@ -52,10 +56,6 @@
     {
       "type": "WEB",
       "url": "http://secunia.com/advisories/56940"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/restlet/restlet-framework-java"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-76qr-mmh8-cp8f/GHSA-76qr-mmh8-cp8f.json b/advisories/github-reviewed/2018/10/GHSA-76qr-mmh8-cp8f/GHSA-76qr-mmh8-cp8f.json
index 9d28379fb93..99c997f74f0 100644
--- a/advisories/github-reviewed/2018/10/GHSA-76qr-mmh8-cp8f/GHSA-76qr-mmh8-cp8f.json
+++ b/advisories/github-reviewed/2018/10/GHSA-76qr-mmh8-cp8f/GHSA-76qr-mmh8-cp8f.json
@@ -68,13 +68,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-76qr-mmh8-cp8f"
     },
-    {
-      "type": "WEB",
-      "url": "http://sparkjava.com/news#spark-272-released"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/perwendel/spark"
+    },
+    {
+      "type": "WEB",
+      "url": "http://sparkjava.com/news#spark-272-released"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-7c2r-3jqf-c9rw/GHSA-7c2r-3jqf-c9rw.json b/advisories/github-reviewed/2018/10/GHSA-7c2r-3jqf-c9rw/GHSA-7c2r-3jqf-c9rw.json
index cc18b369986..2b189fcf0a8 100644
--- a/advisories/github-reviewed/2018/10/GHSA-7c2r-3jqf-c9rw/GHSA-7c2r-3jqf-c9rw.json
+++ b/advisories/github-reviewed/2018/10/GHSA-7c2r-3jqf-c9rw/GHSA-7c2r-3jqf-c9rw.json
@@ -67,6 +67,10 @@
       "type": "WEB",
       "url": "https://bugzilla.redhat.com/show_bug.cgi?id=1378673"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-dataformat-xml"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7c2r-3jqf-c9rw"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/97688"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-dataformat-xml"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-84cm-x2q5-8225/GHSA-84cm-x2q5-8225.json b/advisories/github-reviewed/2018/10/GHSA-84cm-x2q5-8225/GHSA-84cm-x2q5-8225.json
index c2f6811600d..3dc6f86ddfb 100644
--- a/advisories/github-reviewed/2018/10/GHSA-84cm-x2q5-8225/GHSA-84cm-x2q5-8225.json
+++ b/advisories/github-reviewed/2018/10/GHSA-84cm-x2q5-8225/GHSA-84cm-x2q5-8225.json
@@ -52,13 +52,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-84cm-x2q5-8225"
     },
-    {
-      "type": "WEB",
-      "url": "https://lists.debian.org/debian-lts-announce/2018/09/msg00002.html"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/dojo/dojox"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.debian.org/debian-lts-announce/2018/09/msg00002.html"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-89gc-6cw6-4vch/GHSA-89gc-6cw6-4vch.json b/advisories/github-reviewed/2018/10/GHSA-89gc-6cw6-4vch/GHSA-89gc-6cw6-4vch.json
index 2da8d33a721..759138e37df 100644
--- a/advisories/github-reviewed/2018/10/GHSA-89gc-6cw6-4vch/GHSA-89gc-6cw6-4vch.json
+++ b/advisories/github-reviewed/2018/10/GHSA-89gc-6cw6-4vch/GHSA-89gc-6cw6-4vch.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-89gc-6cw6-4vch"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/perwendel/spark"
+    },
     {
       "type": "WEB",
       "url": "http://seclists.org/fulldisclosure/2016/Nov/13"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/94218"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/perwendel/spark"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-93jq-624g-4p9p/GHSA-93jq-624g-4p9p.json b/advisories/github-reviewed/2018/10/GHSA-93jq-624g-4p9p/GHSA-93jq-624g-4p9p.json
index 7d2bfe85daa..597b006d981 100644
--- a/advisories/github-reviewed/2018/10/GHSA-93jq-624g-4p9p/GHSA-93jq-624g-4p9p.json
+++ b/advisories/github-reviewed/2018/10/GHSA-93jq-624g-4p9p/GHSA-93jq-624g-4p9p.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2018:2669"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/AsyncHttpClient/async-http-client"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-93jq-624g-4p9p"
@@ -155,10 +159,6 @@
     {
       "type": "WEB",
       "url": "http://openwall.com/lists/oss-security/2017/08/31/4"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/AsyncHttpClient/async-http-client"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-9prh-257w-9277/GHSA-9prh-257w-9277.json b/advisories/github-reviewed/2018/10/GHSA-9prh-257w-9277/GHSA-9prh-257w-9277.json
index 4b2f9319764..e5a3cac78f5 100644
--- a/advisories/github-reviewed/2018/10/GHSA-9prh-257w-9277/GHSA-9prh-257w-9277.json
+++ b/advisories/github-reviewed/2018/10/GHSA-9prh-257w-9277/GHSA-9prh-257w-9277.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-9prh-257w-9277"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/wycats/handlebars.js"
+    },
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/61"
@@ -71,10 +75,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/96434"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/wycats/handlebars.js"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-9x6q-5423-w5v9/GHSA-9x6q-5423-w5v9.json b/advisories/github-reviewed/2018/10/GHSA-9x6q-5423-w5v9/GHSA-9x6q-5423-w5v9.json
index 190957d8041..985a2f58f28 100644
--- a/advisories/github-reviewed/2018/10/GHSA-9x6q-5423-w5v9/GHSA-9x6q-5423-w5v9.json
+++ b/advisories/github-reviewed/2018/10/GHSA-9x6q-5423-w5v9/GHSA-9x6q-5423-w5v9.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-9x6q-5423-w5v9"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/ansible/ansible"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/pypa/advisory-database/tree/main/vulns/ansible/PYSEC-2018-36.yaml"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2013/07/02/6"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/ansible/ansible"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/10/GHSA-c7j7-p5jq-26ff/GHSA-c7j7-p5jq-26ff.json b/advisories/github-reviewed/2018/10/GHSA-c7j7-p5jq-26ff/GHSA-c7j7-p5jq-26ff.json
index 4d48b47c382..b473fea18cf 100644
--- a/advisories/github-reviewed/2018/10/GHSA-c7j7-p5jq-26ff/GHSA-c7j7-p5jq-26ff.json
+++ b/advisories/github-reviewed/2018/10/GHSA-c7j7-p5jq-26ff/GHSA-c7j7-p5jq-26ff.json
@@ -53,6 +53,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c7j7-p5jq-26ff"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/phusion/passenger"
+    },
     {
       "type": "WEB",
       "url": "http://lists.fedoraproject.org/pipermail/package-announce/2015-February/149032.html"
@@ -64,10 +68,6 @@
     {
       "type": "WEB",
       "url": "http://openwall.com/lists/oss-security/2014/01/30/3"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/phusion/passenger"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/11/GHSA-3p4q-x8f3-p7vq/GHSA-3p4q-x8f3-p7vq.json b/advisories/github-reviewed/2018/11/GHSA-3p4q-x8f3-p7vq/GHSA-3p4q-x8f3-p7vq.json
index 19af0b36d41..8964602beff 100644
--- a/advisories/github-reviewed/2018/11/GHSA-3p4q-x8f3-p7vq/GHSA-3p4q-x8f3-p7vq.json
+++ b/advisories/github-reviewed/2018/11/GHSA-3p4q-x8f3-p7vq/GHSA-3p4q-x8f3-p7vq.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3p4q-x8f3-p7vq"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/jupyter/notebook"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/jupyter/notebook/blob/master/docs/source/changelog.rst"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://pypi.org/project/notebook/#history"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/jupyter/notebook"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/11/GHSA-49qr-xh3w-h436/GHSA-49qr-xh3w-h436.json b/advisories/github-reviewed/2018/11/GHSA-49qr-xh3w-h436/GHSA-49qr-xh3w-h436.json
index 8d776be6532..c1dd0ad77f5 100644
--- a/advisories/github-reviewed/2018/11/GHSA-49qr-xh3w-h436/GHSA-49qr-xh3w-h436.json
+++ b/advisories/github-reviewed/2018/11/GHSA-49qr-xh3w-h436/GHSA-49qr-xh3w-h436.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-49qr-xh3w-h436"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/jupyter/notebook"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/jupyter/notebook/blob/master/docs/source/changelog.rst"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "https://pypi.org/project/notebook/#history"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/jupyter/notebook"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/11/GHSA-5xgh-643p-cp2g/GHSA-5xgh-643p-cp2g.json b/advisories/github-reviewed/2018/11/GHSA-5xgh-643p-cp2g/GHSA-5xgh-643p-cp2g.json
index 629a9dda17b..0e5c794ce18 100644
--- a/advisories/github-reviewed/2018/11/GHSA-5xgh-643p-cp2g/GHSA-5xgh-643p-cp2g.json
+++ b/advisories/github-reviewed/2018/11/GHSA-5xgh-643p-cp2g/GHSA-5xgh-643p-cp2g.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/YMFE/yapi/issues/520"
     },
-    {
-      "type": "ADVISORY",
-      "url": "https://github.com/advisories/GHSA-5xgh-643p-cp2g"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/YMFE/yapi"
+    },
+    {
+      "type": "ADVISORY",
+      "url": "https://github.com/advisories/GHSA-5xgh-643p-cp2g"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/11/GHSA-79mx-88w7-8f7q/GHSA-79mx-88w7-8f7q.json b/advisories/github-reviewed/2018/11/GHSA-79mx-88w7-8f7q/GHSA-79mx-88w7-8f7q.json
index 428b3de5233..10e97b26aa0 100644
--- a/advisories/github-reviewed/2018/11/GHSA-79mx-88w7-8f7q/GHSA-79mx-88w7-8f7q.json
+++ b/advisories/github-reviewed/2018/11/GHSA-79mx-88w7-8f7q/GHSA-79mx-88w7-8f7q.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-79mx-88w7-8f7q"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/chriso/validator.js"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/43"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/97102"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/chriso/validator.js"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/11/GHSA-c7c7-xm8g-xm36/GHSA-c7c7-xm8g-xm36.json b/advisories/github-reviewed/2018/11/GHSA-c7c7-xm8g-xm36/GHSA-c7c7-xm8g-xm36.json
index 1f75793ed44..14e1ed6d39a 100644
--- a/advisories/github-reviewed/2018/11/GHSA-c7c7-xm8g-xm36/GHSA-c7c7-xm8g-xm36.json
+++ b/advisories/github-reviewed/2018/11/GHSA-c7c7-xm8g-xm36/GHSA-c7c7-xm8g-xm36.json
@@ -40,6 +40,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2018-18830"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://gitee.com/mingSoft/MCMS"
+    },
     {
       "type": "WEB",
       "url": "https://gitee.com/mingSoft/MCMS/issues/IO0IQ"
@@ -47,10 +51,6 @@
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-c7c7-xm8g-xm36"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://gitee.com/mingSoft/MCMS"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/12/GHSA-5p52-j8pw-j7x5/GHSA-5p52-j8pw-j7x5.json b/advisories/github-reviewed/2018/12/GHSA-5p52-j8pw-j7x5/GHSA-5p52-j8pw-j7x5.json
index 95fd38754de..b6f00ea94f5 100644
--- a/advisories/github-reviewed/2018/12/GHSA-5p52-j8pw-j7x5/GHSA-5p52-j8pw-j7x5.json
+++ b/advisories/github-reviewed/2018/12/GHSA-5p52-j8pw-j7x5/GHSA-5p52-j8pw-j7x5.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/Bedework/bw-webdav/pull/1"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Bedework/bw-webdav"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/Bedework/bw-webdav/compare/bw-webdav-4.0.2...bw-webdav-4.0.3"
@@ -51,10 +55,6 @@
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-5p52-j8pw-j7x5"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Bedework/bw-webdav"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/12/GHSA-894g-6j7q-2hx6/GHSA-894g-6j7q-2hx6.json b/advisories/github-reviewed/2018/12/GHSA-894g-6j7q-2hx6/GHSA-894g-6j7q-2hx6.json
index 8c66b531b0e..2d9e331fabe 100644
--- a/advisories/github-reviewed/2018/12/GHSA-894g-6j7q-2hx6/GHSA-894g-6j7q-2hx6.json
+++ b/advisories/github-reviewed/2018/12/GHSA-894g-6j7q-2hx6/GHSA-894g-6j7q-2hx6.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-894g-6j7q-2hx6"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/flask-admin/flask-admin"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/flask-admin/flask-admin/releases/tag/v1.5.3"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/ZU2VKULURVXEU4YFTLMBQGYMPSXQ4MBN/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/flask-admin/flask-admin"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/12/GHSA-8p8g-f9vg-r7xr/GHSA-8p8g-f9vg-r7xr.json b/advisories/github-reviewed/2018/12/GHSA-8p8g-f9vg-r7xr/GHSA-8p8g-f9vg-r7xr.json
index 2b50a14e936..ef58961d1ac 100644
--- a/advisories/github-reviewed/2018/12/GHSA-8p8g-f9vg-r7xr/GHSA-8p8g-f9vg-r7xr.json
+++ b/advisories/github-reviewed/2018/12/GHSA-8p8g-f9vg-r7xr/GHSA-8p8g-f9vg-r7xr.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8p8g-f9vg-r7xr"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/square/retrofit"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/square/retrofit/blob/master/CHANGELOG.md"
@@ -71,10 +75,6 @@
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/f9bc3e55f4e28d1dcd1a69aae6d53e609a758e34d2869b4d798e13cc@%3Cissues.drill.apache.org%3E"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/square/retrofit"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2018/12/GHSA-9fcp-vcq9-9h2h/GHSA-9fcp-vcq9-9h2h.json b/advisories/github-reviewed/2018/12/GHSA-9fcp-vcq9-9h2h/GHSA-9fcp-vcq9-9h2h.json
index 109c30b9616..f40460bd4fc 100644
--- a/advisories/github-reviewed/2018/12/GHSA-9fcp-vcq9-9h2h/GHSA-9fcp-vcq9-9h2h.json
+++ b/advisories/github-reviewed/2018/12/GHSA-9fcp-vcq9-9h2h/GHSA-9fcp-vcq9-9h2h.json
@@ -48,13 +48,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-9fcp-vcq9-9h2h"
     },
-    {
-      "type": "WEB",
-      "url": "https://medium.com/@buxuqua/rce-vulnerability-in-crafter-cms-server-side-template-injection-19d8708ce242"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/craftercms/craftercms"
+    },
+    {
+      "type": "WEB",
+      "url": "https://medium.com/@buxuqua/rce-vulnerability-in-crafter-cms-server-side-template-injection-19d8708ce242"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/01/GHSA-42fp-4hm3-j8r7/GHSA-42fp-4hm3-j8r7.json b/advisories/github-reviewed/2019/01/GHSA-42fp-4hm3-j8r7/GHSA-42fp-4hm3-j8r7.json
index 55fa0b3cde3..06fc8def08d 100644
--- a/advisories/github-reviewed/2019/01/GHSA-42fp-4hm3-j8r7/GHSA-42fp-4hm3-j8r7.json
+++ b/advisories/github-reviewed/2019/01/GHSA-42fp-4hm3-j8r7/GHSA-42fp-4hm3-j8r7.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-42fp-4hm3-j8r7"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/moinwiki/moin-1.9"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2018/10/msg00007.html"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "http://moinmo.in/SecurityFixes"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/moinwiki/moin-1.9"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/01/GHSA-45r8-3495-x6rm/GHSA-45r8-3495-x6rm.json b/advisories/github-reviewed/2019/01/GHSA-45r8-3495-x6rm/GHSA-45r8-3495-x6rm.json
index 91f1cae5c41..f35ddc483dd 100644
--- a/advisories/github-reviewed/2019/01/GHSA-45r8-3495-x6rm/GHSA-45r8-3495-x6rm.json
+++ b/advisories/github-reviewed/2019/01/GHSA-45r8-3495-x6rm/GHSA-45r8-3495-x6rm.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/HubSpot/jinjava/pull/230"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/HubSpot/jinjava"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/HubSpot/jinjava/blob/master/CHANGES.md"
@@ -51,10 +55,6 @@
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-45r8-3495-x6rm"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/HubSpot/jinjava"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/01/GHSA-4q69-q4q7-x82c/GHSA-4q69-q4q7-x82c.json b/advisories/github-reviewed/2019/01/GHSA-4q69-q4q7-x82c/GHSA-4q69-q4q7-x82c.json
index 13d0d41c1c6..304594d5747 100644
--- a/advisories/github-reviewed/2019/01/GHSA-4q69-q4q7-x82c/GHSA-4q69-q4q7-x82c.json
+++ b/advisories/github-reviewed/2019/01/GHSA-4q69-q4q7-x82c/GHSA-4q69-q4q7-x82c.json
@@ -52,13 +52,13 @@
       "type": "WEB",
       "url": "https://bugs.chromium.org/p/chromium/issues/detail?id=759111"
     },
-    {
-      "type": "ADVISORY",
-      "url": "https://github.com/advisories/GHSA-4q69-q4q7-x82c"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/GoogleChrome/rendertron"
+    },
+    {
+      "type": "ADVISORY",
+      "url": "https://github.com/advisories/GHSA-4q69-q4q7-x82c"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/01/GHSA-98gj-wwxm-cj3h/GHSA-98gj-wwxm-cj3h.json b/advisories/github-reviewed/2019/01/GHSA-98gj-wwxm-cj3h/GHSA-98gj-wwxm-cj3h.json
index e52b22376c3..a2077b74f7b 100644
--- a/advisories/github-reviewed/2019/01/GHSA-98gj-wwxm-cj3h/GHSA-98gj-wwxm-cj3h.json
+++ b/advisories/github-reviewed/2019/01/GHSA-98gj-wwxm-cj3h/GHSA-98gj-wwxm-cj3h.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-98gj-wwxm-cj3h"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/lepture/mistune"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/lepture/mistune/blob/master/CHANGES.rst"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/NUR3GMHQBMA3UC4PFMCK6GCLOQC4LQQC/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/lepture/mistune"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/02/GHSA-3q32-j57w-q4w7/GHSA-3q32-j57w-q4w7.json b/advisories/github-reviewed/2019/02/GHSA-3q32-j57w-q4w7/GHSA-3q32-j57w-q4w7.json
index 5bb376dad81..bd2cf3101e4 100644
--- a/advisories/github-reviewed/2019/02/GHSA-3q32-j57w-q4w7/GHSA-3q32-j57w-q4w7.json
+++ b/advisories/github-reviewed/2019/02/GHSA-3q32-j57w-q4w7/GHSA-3q32-j57w-q4w7.json
@@ -56,13 +56,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3q32-j57w-q4w7"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/1026"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/totaljs/framework"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/1026"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/02/GHSA-4pf7-579w-f4gm/GHSA-4pf7-579w-f4gm.json b/advisories/github-reviewed/2019/02/GHSA-4pf7-579w-f4gm/GHSA-4pf7-579w-f4gm.json
index 70499260508..2fb888a7a9f 100644
--- a/advisories/github-reviewed/2019/02/GHSA-4pf7-579w-f4gm/GHSA-4pf7-579w-f4gm.json
+++ b/advisories/github-reviewed/2019/02/GHSA-4pf7-579w-f4gm/GHSA-4pf7-579w-f4gm.json
@@ -37,6 +37,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2016-10633"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/1000ch/dwebp-bin"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-4pf7-579w-f4gm"
@@ -48,10 +52,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/232"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/1000ch/dwebp-bin"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/02/GHSA-735c-r4vc-6gm9/GHSA-735c-r4vc-6gm9.json b/advisories/github-reviewed/2019/02/GHSA-735c-r4vc-6gm9/GHSA-735c-r4vc-6gm9.json
index f920edf878b..2180b25bcf1 100644
--- a/advisories/github-reviewed/2019/02/GHSA-735c-r4vc-6gm9/GHSA-735c-r4vc-6gm9.json
+++ b/advisories/github-reviewed/2019/02/GHSA-735c-r4vc-6gm9/GHSA-735c-r4vc-6gm9.json
@@ -37,6 +37,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2016-10613"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/bionode/bionode-sra"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/211"
@@ -44,10 +48,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/211"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/bionode/bionode-sra"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/02/GHSA-7vrq-vg6p-32fw/GHSA-7vrq-vg6p-32fw.json b/advisories/github-reviewed/2019/02/GHSA-7vrq-vg6p-32fw/GHSA-7vrq-vg6p-32fw.json
index dda5fdfe917..287376d290c 100644
--- a/advisories/github-reviewed/2019/02/GHSA-7vrq-vg6p-32fw/GHSA-7vrq-vg6p-32fw.json
+++ b/advisories/github-reviewed/2019/02/GHSA-7vrq-vg6p-32fw/GHSA-7vrq-vg6p-32fw.json
@@ -37,6 +37,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2016-10585"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/DirtyHairy/node-libxl"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7vrq-vg6p-32fw"
@@ -48,10 +52,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/178"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/DirtyHairy/node-libxl"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/02/GHSA-92qm-hc53-jjrj/GHSA-92qm-hc53-jjrj.json b/advisories/github-reviewed/2019/02/GHSA-92qm-hc53-jjrj/GHSA-92qm-hc53-jjrj.json
index 5006704198d..24531c73566 100644
--- a/advisories/github-reviewed/2019/02/GHSA-92qm-hc53-jjrj/GHSA-92qm-hc53-jjrj.json
+++ b/advisories/github-reviewed/2019/02/GHSA-92qm-hc53-jjrj/GHSA-92qm-hc53-jjrj.json
@@ -41,6 +41,10 @@
       "type": "WEB",
       "url": "https://gitlord.com/commitdiff/~dchem%2Fnode-ibapi-addon.git/c00dd7c98cca0423052148337e523eeb7776da68"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://gitlord.com/r/~dchem/node-ibapi-addon.git"
+    },
     {
       "type": "WEB",
       "url": "https://gitlord.com/summary/~dchem%2Fnode-ibapi-addon.git"
@@ -56,10 +60,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/package/ibapi/v/2.5.6"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://gitlord.com/r/~dchem/node-ibapi-addon.git"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/02/GHSA-97gv-3p2c-xw7j/GHSA-97gv-3p2c-xw7j.json b/advisories/github-reviewed/2019/02/GHSA-97gv-3p2c-xw7j/GHSA-97gv-3p2c-xw7j.json
index 0a92a25edba..70573a13210 100644
--- a/advisories/github-reviewed/2019/02/GHSA-97gv-3p2c-xw7j/GHSA-97gv-3p2c-xw7j.json
+++ b/advisories/github-reviewed/2019/02/GHSA-97gv-3p2c-xw7j/GHSA-97gv-3p2c-xw7j.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-97gv-3p2c-xw7j"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/oliversalzburg/i18n-node-angular"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/80"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/80"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/oliversalzburg/i18n-node-angular"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/02/GHSA-9gqh-q4cx-f2h9/GHSA-9gqh-q4cx-f2h9.json b/advisories/github-reviewed/2019/02/GHSA-9gqh-q4cx-f2h9/GHSA-9gqh-q4cx-f2h9.json
index b43f216d796..25857507d6e 100644
--- a/advisories/github-reviewed/2019/02/GHSA-9gqh-q4cx-f2h9/GHSA-9gqh-q4cx-f2h9.json
+++ b/advisories/github-reviewed/2019/02/GHSA-9gqh-q4cx-f2h9/GHSA-9gqh-q4cx-f2h9.json
@@ -37,6 +37,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2016-10594"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/ChiChou/node-ipip"
+    },
     {
       "type": "WEB",
       "url": "https://nodesecurity.io/advisories/184"
@@ -44,10 +48,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/184"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/ChiChou/node-ipip"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/03/GHSA-8554-jxcw-454q/GHSA-8554-jxcw-454q.json b/advisories/github-reviewed/2019/03/GHSA-8554-jxcw-454q/GHSA-8554-jxcw-454q.json
index 36f313f74fc..376c55b72ce 100644
--- a/advisories/github-reviewed/2019/03/GHSA-8554-jxcw-454q/GHSA-8554-jxcw-454q.json
+++ b/advisories/github-reviewed/2019/03/GHSA-8554-jxcw-454q/GHSA-8554-jxcw-454q.json
@@ -48,13 +48,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-8554-jxcw-454q"
     },
-    {
-      "type": "WEB",
-      "url": "https://webargs.readthedocs.io/en/latest/changelog.html"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/marshmallow-code/webargs"
+    },
+    {
+      "type": "WEB",
+      "url": "https://webargs.readthedocs.io/en/latest/changelog.html"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-2777-2vq8-c4v4/GHSA-2777-2vq8-c4v4.json b/advisories/github-reviewed/2019/04/GHSA-2777-2vq8-c4v4/GHSA-2777-2vq8-c4v4.json
index 15e8e3b9d69..28dff1cdf45 100644
--- a/advisories/github-reviewed/2019/04/GHSA-2777-2vq8-c4v4/GHSA-2777-2vq8-c4v4.json
+++ b/advisories/github-reviewed/2019/04/GHSA-2777-2vq8-c4v4/GHSA-2777-2vq8-c4v4.json
@@ -52,6 +52,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-2777-2vq8-c4v4"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/sequelize/sequelize"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/sequelize/sequelize/blob/98cb17c17f73e2aa1792aa5a1d31216ba984b456/lib/dialects/postgres/connection-manager.js#L158-L160"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/821"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/sequelize/sequelize"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-38fc-9xqv-7f7q/GHSA-38fc-9xqv-7f7q.json b/advisories/github-reviewed/2019/04/GHSA-38fc-9xqv-7f7q/GHSA-38fc-9xqv-7f7q.json
index e7edb9bfbbe..0b107c2cc78 100644
--- a/advisories/github-reviewed/2019/04/GHSA-38fc-9xqv-7f7q/GHSA-38fc-9xqv-7f7q.json
+++ b/advisories/github-reviewed/2019/04/GHSA-38fc-9xqv-7f7q/GHSA-38fc-9xqv-7f7q.json
@@ -60,6 +60,10 @@
       "type": "WEB",
       "url": "https://github.com/no-security/sqlalchemy_test"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/sqlalchemy/sqlalchemy"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2019/03/msg00020.html"
@@ -83,10 +87,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2019-09/msg00016.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/sqlalchemy/sqlalchemy"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-5xc6-fpc7-4qvg/GHSA-5xc6-fpc7-4qvg.json b/advisories/github-reviewed/2019/04/GHSA-5xc6-fpc7-4qvg/GHSA-5xc6-fpc7-4qvg.json
index 510b035bfbc..2028836fe18 100644
--- a/advisories/github-reviewed/2019/04/GHSA-5xc6-fpc7-4qvg/GHSA-5xc6-fpc7-4qvg.json
+++ b/advisories/github-reviewed/2019/04/GHSA-5xc6-fpc7-4qvg/GHSA-5xc6-fpc7-4qvg.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/Tanganelli/CoAPthon/issues/135"
     },
-    {
-      "type": "ADVISORY",
-      "url": "https://github.com/advisories/GHSA-5xc6-fpc7-4qvg"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/Tanganelli/CoAPthon"
+    },
+    {
+      "type": "ADVISORY",
+      "url": "https://github.com/advisories/GHSA-5xc6-fpc7-4qvg"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-7752-f4gf-94gc/GHSA-7752-f4gf-94gc.json b/advisories/github-reviewed/2019/04/GHSA-7752-f4gf-94gc/GHSA-7752-f4gf-94gc.json
index 35c12cf9ab6..d117fce19eb 100644
--- a/advisories/github-reviewed/2019/04/GHSA-7752-f4gf-94gc/GHSA-7752-f4gf-94gc.json
+++ b/advisories/github-reviewed/2019/04/GHSA-7752-f4gf-94gc/GHSA-7752-f4gf-94gc.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/Dogfalo/materialize/issues/6286"
     },
-    {
-      "type": "WEB",
-      "url": "https://snyk.io/vuln/SNYK-JS-MATERIALIZECSS-174144"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/Dogfalo/materialize"
+    },
+    {
+      "type": "WEB",
+      "url": "https://snyk.io/vuln/SNYK-JS-MATERIALIZECSS-174144"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-887w-45rq-vxgf/GHSA-887w-45rq-vxgf.json b/advisories/github-reviewed/2019/04/GHSA-887w-45rq-vxgf/GHSA-887w-45rq-vxgf.json
index 74acfa80e0e..0e89092137e 100644
--- a/advisories/github-reviewed/2019/04/GHSA-887w-45rq-vxgf/GHSA-887w-45rq-vxgf.json
+++ b/advisories/github-reviewed/2019/04/GHSA-887w-45rq-vxgf/GHSA-887w-45rq-vxgf.json
@@ -78,6 +78,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-887w-45rq-vxgf"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/sqlalchemy/sqlalchemy"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2019/03/msg00020.html"
@@ -101,10 +105,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2019-09/msg00016.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/sqlalchemy/sqlalchemy"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-98f7-p5rc-jx67/GHSA-98f7-p5rc-jx67.json b/advisories/github-reviewed/2019/04/GHSA-98f7-p5rc-jx67/GHSA-98f7-p5rc-jx67.json
index e0501465337..52b14da18e0 100644
--- a/advisories/github-reviewed/2019/04/GHSA-98f7-p5rc-jx67/GHSA-98f7-p5rc-jx67.json
+++ b/advisories/github-reviewed/2019/04/GHSA-98f7-p5rc-jx67/GHSA-98f7-p5rc-jx67.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/Dogfalo/materialize/issues/6286"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Dogfalo/materialize"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-98f7-p5rc-jx67"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/818"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Dogfalo/materialize"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/04/GHSA-c6fm-rgw4-8q73/GHSA-c6fm-rgw4-8q73.json b/advisories/github-reviewed/2019/04/GHSA-c6fm-rgw4-8q73/GHSA-c6fm-rgw4-8q73.json
index f7ccc65df39..249ca8f0bb9 100644
--- a/advisories/github-reviewed/2019/04/GHSA-c6fm-rgw4-8q73/GHSA-c6fm-rgw4-8q73.json
+++ b/advisories/github-reviewed/2019/04/GHSA-c6fm-rgw4-8q73/GHSA-c6fm-rgw4-8q73.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/Tanganelli/CoAPthon3/issues/16"
     },
-    {
-      "type": "ADVISORY",
-      "url": "https://github.com/advisories/GHSA-c6fm-rgw4-8q73"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/Tanganelli/CoAPthon3"
+    },
+    {
+      "type": "ADVISORY",
+      "url": "https://github.com/advisories/GHSA-c6fm-rgw4-8q73"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/05/GHSA-78j5-gcmf-vqc8/GHSA-78j5-gcmf-vqc8.json b/advisories/github-reviewed/2019/05/GHSA-78j5-gcmf-vqc8/GHSA-78j5-gcmf-vqc8.json
index c7d7537218d..4b5e6f55706 100644
--- a/advisories/github-reviewed/2019/05/GHSA-78j5-gcmf-vqc8/GHSA-78j5-gcmf-vqc8.json
+++ b/advisories/github-reviewed/2019/05/GHSA-78j5-gcmf-vqc8/GHSA-78j5-gcmf-vqc8.json
@@ -44,6 +44,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-14772"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/verdaccio/verdaccio"
+    },
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/832"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/833"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/verdaccio/verdaccio"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/06/GHSA-2479-qvv7-47qq/GHSA-2479-qvv7-47qq.json b/advisories/github-reviewed/2019/06/GHSA-2479-qvv7-47qq/GHSA-2479-qvv7-47qq.json
index f4c0ec914dd..103670eadd2 100644
--- a/advisories/github-reviewed/2019/06/GHSA-2479-qvv7-47qq/GHSA-2479-qvv7-47qq.json
+++ b/advisories/github-reviewed/2019/06/GHSA-2479-qvv7-47qq/GHSA-2479-qvv7-47qq.json
@@ -48,6 +48,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-2479-qvv7-47qq"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/parse-community/parse-server"
+    },
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JS-PARSESERVER-455635"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/1113"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/parse-community/parse-server"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/06/GHSA-4vr3-9v7h-5f8v/GHSA-4vr3-9v7h-5f8v.json b/advisories/github-reviewed/2019/06/GHSA-4vr3-9v7h-5f8v/GHSA-4vr3-9v7h-5f8v.json
index 785f376185e..4e68c801720 100644
--- a/advisories/github-reviewed/2019/06/GHSA-4vr3-9v7h-5f8v/GHSA-4vr3-9v7h-5f8v.json
+++ b/advisories/github-reviewed/2019/06/GHSA-4vr3-9v7h-5f8v/GHSA-4vr3-9v7h-5f8v.json
@@ -37,13 +37,13 @@
       "type": "WEB",
       "url": "https://github.com/Archomeda/Gw2Sharp/security/advisories/GHSA-4vr3-9v7h-5f8v"
     },
-    {
-      "type": "ADVISORY",
-      "url": "https://github.com/advisories/GHSA-4vr3-9v7h-5f8v"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/Archomeda/Gw2Sharp"
+    },
+    {
+      "type": "ADVISORY",
+      "url": "https://github.com/advisories/GHSA-4vr3-9v7h-5f8v"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/07/GHSA-958r-g534-ccmr/GHSA-958r-g534-ccmr.json b/advisories/github-reviewed/2019/07/GHSA-958r-g534-ccmr/GHSA-958r-g534-ccmr.json
index 31384184323..76906936f80 100644
--- a/advisories/github-reviewed/2019/07/GHSA-958r-g534-ccmr/GHSA-958r-g534-ccmr.json
+++ b/advisories/github-reviewed/2019/07/GHSA-958r-g534-ccmr/GHSA-958r-g534-ccmr.json
@@ -44,6 +44,10 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-958r-g534-ccmr"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/madskristensen/Miniblog.Core"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/madskristensen/Miniblog.Core/blob/master/src/Controllers/BlogController.cs#L142"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "https://rastating.github.io/miniblog-remote-code-execution/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/madskristensen/Miniblog.Core"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/08/GHSA-3gx7-xhv7-5mx3/GHSA-3gx7-xhv7-5mx3.json b/advisories/github-reviewed/2019/08/GHSA-3gx7-xhv7-5mx3/GHSA-3gx7-xhv7-5mx3.json
index 2b7c1f2b305..081693c461a 100644
--- a/advisories/github-reviewed/2019/08/GHSA-3gx7-xhv7-5mx3/GHSA-3gx7-xhv7-5mx3.json
+++ b/advisories/github-reviewed/2019/08/GHSA-3gx7-xhv7-5mx3/GHSA-3gx7-xhv7-5mx3.json
@@ -52,13 +52,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3gx7-xhv7-5mx3"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/1118"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/mysticatea/eslint-utils"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/1118"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/09/GHSA-3v43-877x-qgmq/GHSA-3v43-877x-qgmq.json b/advisories/github-reviewed/2019/09/GHSA-3v43-877x-qgmq/GHSA-3v43-877x-qgmq.json
index b5807bff312..d9c91a9b14e 100644
--- a/advisories/github-reviewed/2019/09/GHSA-3v43-877x-qgmq/GHSA-3v43-877x-qgmq.json
+++ b/advisories/github-reviewed/2019/09/GHSA-3v43-877x-qgmq/GHSA-3v43-877x-qgmq.json
@@ -52,13 +52,13 @@
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-3v43-877x-qgmq"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/thephpleague/commonmark/releases/tag/0.18.3"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/thephpleague/commonmark/"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/thephpleague/commonmark/releases/tag/0.18.3"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-582f-p4pg-xc74/GHSA-582f-p4pg-xc74.json b/advisories/github-reviewed/2019/10/GHSA-582f-p4pg-xc74/GHSA-582f-p4pg-xc74.json
index eb3e524dbb8..603cceec404 100644
--- a/advisories/github-reviewed/2019/10/GHSA-582f-p4pg-xc74/GHSA-582f-p4pg-xc74.json
+++ b/advisories/github-reviewed/2019/10/GHSA-582f-p4pg-xc74/GHSA-582f-p4pg-xc74.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/adaltas/node-csv-parse/commit/b9d35940c6815cdf1dfd6b21857a1f6d0fd51e4a"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/adaltas/node-csv-parse"
+    },
     {
       "type": "WEB",
       "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/Z36UKPO5F3PQ3Q2POMF5LEKXWAH5RUFP/"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/1171"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/adaltas/node-csv-parse"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-6jg8-7333-554w/GHSA-6jg8-7333-554w.json b/advisories/github-reviewed/2019/10/GHSA-6jg8-7333-554w/GHSA-6jg8-7333-554w.json
index f175dfef046..64bfa2a0964 100644
--- a/advisories/github-reviewed/2019/10/GHSA-6jg8-7333-554w/GHSA-6jg8-7333-554w.json
+++ b/advisories/github-reviewed/2019/10/GHSA-6jg8-7333-554w/GHSA-6jg8-7333-554w.json
@@ -59,6 +59,10 @@
       "type": "WEB",
       "url": "https://github.com/Agoric/realms-shim/security/advisories/GHSA-6jg8-7333-554w"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Agoric/realms-shim/"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-6jg8-7333-554w"
@@ -86,10 +90,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/1191"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Agoric/realms-shim/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-7cg8-pq9v-x98q/GHSA-7cg8-pq9v-x98q.json b/advisories/github-reviewed/2019/10/GHSA-7cg8-pq9v-x98q/GHSA-7cg8-pq9v-x98q.json
index f868bc8b33b..1a95c58a354 100644
--- a/advisories/github-reviewed/2019/10/GHSA-7cg8-pq9v-x98q/GHSA-7cg8-pq9v-x98q.json
+++ b/advisories/github-reviewed/2019/10/GHSA-7cg8-pq9v-x98q/GHSA-7cg8-pq9v-x98q.json
@@ -40,6 +40,10 @@
       "type": "WEB",
       "url": "https://github.com/Agoric/realms-shim/security/advisories/GHSA-7cg8-pq9v-x98q"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Agoric/realms-shim"
+    },
     {
       "type": "ADVISORY",
       "url": "https://github.com/advisories/GHSA-7cg8-pq9v-x98q"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/1218"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Agoric/realms-shim"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-f6vf-pq8c-69m4/GHSA-f6vf-pq8c-69m4.json b/advisories/github-reviewed/2019/10/GHSA-f6vf-pq8c-69m4/GHSA-f6vf-pq8c-69m4.json
index 4fb7c8116a5..0610c205238 100644
--- a/advisories/github-reviewed/2019/10/GHSA-f6vf-pq8c-69m4/GHSA-f6vf-pq8c-69m4.json
+++ b/advisories/github-reviewed/2019/10/GHSA-f6vf-pq8c-69m4/GHSA-f6vf-pq8c-69m4.json
@@ -40,6 +40,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-17195"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://bitbucket.org/connect2id/nimbus-jose-jwt"
+    },
     {
       "type": "WEB",
       "url": "https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/SECURITY-CHANGELOG.txt"
@@ -103,10 +107,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://bitbucket.org/connect2id/nimbus-jose-jwt"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-p979-4mfw-53vg/GHSA-p979-4mfw-53vg.json b/advisories/github-reviewed/2019/10/GHSA-p979-4mfw-53vg/GHSA-p979-4mfw-53vg.json
index 5eb1eb97b63..68cfc8f4df5 100644
--- a/advisories/github-reviewed/2019/10/GHSA-p979-4mfw-53vg/GHSA-p979-4mfw-53vg.json
+++ b/advisories/github-reviewed/2019/10/GHSA-p979-4mfw-53vg/GHSA-p979-4mfw-53vg.json
@@ -75,6 +75,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2020:0445"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/netty/netty"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/netty/netty/compare/netty-4.1.41.Final...netty-4.1.42.Final"
@@ -362,10 +366,6 @@
     {
       "type": "WEB",
       "url": "https://www.debian.org/security/2020/dsa-4597"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/netty/netty"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-r53w-g4xm-3gc6/GHSA-r53w-g4xm-3gc6.json b/advisories/github-reviewed/2019/10/GHSA-r53w-g4xm-3gc6/GHSA-r53w-g4xm-3gc6.json
index 7c7decb28d5..87130794371 100644
--- a/advisories/github-reviewed/2019/10/GHSA-r53w-g4xm-3gc6/GHSA-r53w-g4xm-3gc6.json
+++ b/advisories/github-reviewed/2019/10/GHSA-r53w-g4xm-3gc6/GHSA-r53w-g4xm-3gc6.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/haml/haml/commit/18576ae6e9bdcb4303fdbe6b3199869d289d67c2"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/haml/haml/"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2019/11/msg00007.html"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-RUBY-HAML-20362"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/haml/haml/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-vfj6-275q-4pvm/GHSA-vfj6-275q-4pvm.json b/advisories/github-reviewed/2019/10/GHSA-vfj6-275q-4pvm/GHSA-vfj6-275q-4pvm.json
index 375039b1d2b..943367944d4 100644
--- a/advisories/github-reviewed/2019/10/GHSA-vfj6-275q-4pvm/GHSA-vfj6-275q-4pvm.json
+++ b/advisories/github-reviewed/2019/10/GHSA-vfj6-275q-4pvm/GHSA-vfj6-275q-4pvm.json
@@ -60,6 +60,10 @@
       "type": "WEB",
       "url": "https://blog.orange.tw/2017/07/how-i-chained-4-vulnerabilities-on.html#second-bug-internal-graphite-ssrf"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/graphite-project/graphite-web"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2019/10/msg00030.html"
@@ -67,10 +71,6 @@
     {
       "type": "WEB",
       "url": "https://www.youtube.com/watch?v=ds4Gp4xoaeA"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/graphite-project/graphite-web"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/10/GHSA-x4w5-r546-x9qh/GHSA-x4w5-r546-x9qh.json b/advisories/github-reviewed/2019/10/GHSA-x4w5-r546-x9qh/GHSA-x4w5-r546-x9qh.json
index 945b7135da6..fd5078fff93 100644
--- a/advisories/github-reviewed/2019/10/GHSA-x4w5-r546-x9qh/GHSA-x4w5-r546-x9qh.json
+++ b/advisories/github-reviewed/2019/10/GHSA-x4w5-r546-x9qh/GHSA-x4w5-r546-x9qh.json
@@ -52,6 +52,10 @@
       "type": "WEB",
       "url": "https://github.com/marcbachmann/node-html-pdf/commit/c12d6977778014139183c9f8da7579fd7ac65362"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/marcbachmann/node-html-pdf/"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/marcbachmann/node-html-pdf/releases/tag/v3.0.1"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/1095"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/marcbachmann/node-html-pdf/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/11/GHSA-36hf-6hp2-9g4c/GHSA-36hf-6hp2-9g4c.json b/advisories/github-reviewed/2019/11/GHSA-36hf-6hp2-9g4c/GHSA-36hf-6hp2-9g4c.json
index 6f240c0d0c5..d78935ac9ff 100644
--- a/advisories/github-reviewed/2019/11/GHSA-36hf-6hp2-9g4c/GHSA-36hf-6hp2-9g4c.json
+++ b/advisories/github-reviewed/2019/11/GHSA-36hf-6hp2-9g4c/GHSA-36hf-6hp2-9g4c.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://aetsu.github.io/OpenCms"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/alkacon/opencms-core"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/alkacon/opencms-core/commits/branch_10_5_x"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "http://packetstormsecurity.com/files/154281/Alkacon-OpenCMS-10.5.x-Local-File-Inclusion.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/alkacon/opencms-core"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/11/GHSA-89mq-4x47-5v83/GHSA-89mq-4x47-5v83.json b/advisories/github-reviewed/2019/11/GHSA-89mq-4x47-5v83/GHSA-89mq-4x47-5v83.json
index ec0ee7e7db0..e4045a62e97 100644
--- a/advisories/github-reviewed/2019/11/GHSA-89mq-4x47-5v83/GHSA-89mq-4x47-5v83.json
+++ b/advisories/github-reviewed/2019/11/GHSA-89mq-4x47-5v83/GHSA-89mq-4x47-5v83.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://github.com/angular/angular.js/commit/add78e62004e80bb1e16ab2dfe224afa8e513bc3"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/angular/angular.js"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/rca37935d661f4689cb4119f1b3b224413b22be161b678e6e6ce0c69b@%3Ccommits.nifi.apache.org%3E"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/1343"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/angular/angular.js"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/11/GHSA-cff7-6h4q-q5pj/GHSA-cff7-6h4q-q5pj.json b/advisories/github-reviewed/2019/11/GHSA-cff7-6h4q-q5pj/GHSA-cff7-6h4q-q5pj.json
index 92e23425e4a..2fb2db498fe 100644
--- a/advisories/github-reviewed/2019/11/GHSA-cff7-6h4q-q5pj/GHSA-cff7-6h4q-q5pj.json
+++ b/advisories/github-reviewed/2019/11/GHSA-cff7-6h4q-q5pj/GHSA-cff7-6h4q-q5pj.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/nov/json-jwt/commit/ada16e772906efdd035e3df49cb2ae372f0f948a"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/nov/json-jwt"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/nov/json-jwt/compare/v1.10.2...v1.11.0"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/10/msg00001.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/nov/json-jwt"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/11/GHSA-pgwj-prpq-jpc2/GHSA-pgwj-prpq-jpc2.json b/advisories/github-reviewed/2019/11/GHSA-pgwj-prpq-jpc2/GHSA-pgwj-prpq-jpc2.json
index 5114297a714..7ca66ced9a1 100644
--- a/advisories/github-reviewed/2019/11/GHSA-pgwj-prpq-jpc2/GHSA-pgwj-prpq-jpc2.json
+++ b/advisories/github-reviewed/2019/11/GHSA-pgwj-prpq-jpc2/GHSA-pgwj-prpq-jpc2.json
@@ -322,6 +322,10 @@
       "type": "WEB",
       "url": "https://github.com/FriendsOfPHP/security-advisories/blob/master/symfony/symfony/CVE-2019-10910.yaml"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/symfony/symfony"
+    },
     {
       "type": "WEB",
       "url": "https://symfony.com/blog/cve-2019-10910-check-service-ids-are-valid"
@@ -333,10 +337,6 @@
     {
       "type": "WEB",
       "url": "https://www.synology.com/security/advisory/Synology_SA_19_19"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/symfony/symfony"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/11/GHSA-vrcf-g539-x6h3/GHSA-vrcf-g539-x6h3.json b/advisories/github-reviewed/2019/11/GHSA-vrcf-g539-x6h3/GHSA-vrcf-g539-x6h3.json
index 0ca014d72e5..8c2f808981d 100644
--- a/advisories/github-reviewed/2019/11/GHSA-vrcf-g539-x6h3/GHSA-vrcf-g539-x6h3.json
+++ b/advisories/github-reviewed/2019/11/GHSA-vrcf-g539-x6h3/GHSA-vrcf-g539-x6h3.json
@@ -62,6 +62,10 @@
       "type": "WEB",
       "url": "https://github.com/frostming/rediswrapper/commit/748f60bafd857c24f65683426f665350e2c3f91b"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/frostming/rediswrapper"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/frostming/rediswrapper/compare/v0.2.1...v0.3.0"
@@ -69,10 +73,6 @@
     {
       "type": "WEB",
       "url": "https://github.com/frostming/rediswrapper/releases/tag/v0.3.0"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/frostming/rediswrapper"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/11/GHSA-xcrg-29h7-h4cj/GHSA-xcrg-29h7-h4cj.json b/advisories/github-reviewed/2019/11/GHSA-xcrg-29h7-h4cj/GHSA-xcrg-29h7-h4cj.json
index b9ffd75df26..78133a3fa1c 100644
--- a/advisories/github-reviewed/2019/11/GHSA-xcrg-29h7-h4cj/GHSA-xcrg-29h7-h4cj.json
+++ b/advisories/github-reviewed/2019/11/GHSA-xcrg-29h7-h4cj/GHSA-xcrg-29h7-h4cj.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://github.com/PHPOffice/PhpSpreadsheet/issues/771"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/PHPOffice/PhpSpreadsheet"
+    },
     {
       "type": "WEB",
       "url": "https://www.bishopfox.com/news/2018/11/phpoffice-versions/"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://www.drupal.org/sa-contrib-2021-043"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/PHPOffice/PhpSpreadsheet"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/12/GHSA-844w-j86r-4x2j/GHSA-844w-j86r-4x2j.json b/advisories/github-reviewed/2019/12/GHSA-844w-j86r-4x2j/GHSA-844w-j86r-4x2j.json
index 360604a1b9a..d0b814af962 100644
--- a/advisories/github-reviewed/2019/12/GHSA-844w-j86r-4x2j/GHSA-844w-j86r-4x2j.json
+++ b/advisories/github-reviewed/2019/12/GHSA-844w-j86r-4x2j/GHSA-844w-j86r-4x2j.json
@@ -86,13 +86,13 @@
       "type": "WEB",
       "url": "https://github.com/tensorflow/tensorflow/commit/db4f9717c41bccc3ce10099ab61996b246099892"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/tensorflow/tensorflow/blob/master/tensorflow/security/advisory/tfsa-2019-002.md"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/tensorflow/tensorflow"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/tensorflow/tensorflow/blob/master/tensorflow/security/advisory/tfsa-2019-002.md"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/12/GHSA-g2xc-35jw-c63p/GHSA-g2xc-35jw-c63p.json b/advisories/github-reviewed/2019/12/GHSA-g2xc-35jw-c63p/GHSA-g2xc-35jw-c63p.json
index 00dd8c819d2..622b33b7bac 100644
--- a/advisories/github-reviewed/2019/12/GHSA-g2xc-35jw-c63p/GHSA-g2xc-35jw-c63p.json
+++ b/advisories/github-reviewed/2019/12/GHSA-g2xc-35jw-c63p/GHSA-g2xc-35jw-c63p.json
@@ -67,6 +67,10 @@
       "type": "WEB",
       "url": "https://docs.pylonsproject.org/projects/waitress/en/latest/#security-fixes"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Pylons/waitress"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2022/05/msg00011.html"
@@ -82,10 +86,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuapr2022.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Pylons/waitress"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/12/GHSA-hrqr-hxpp-chr3/GHSA-hrqr-hxpp-chr3.json b/advisories/github-reviewed/2019/12/GHSA-hrqr-hxpp-chr3/GHSA-hrqr-hxpp-chr3.json
index 972f45f63e7..0e6c3cfa870 100644
--- a/advisories/github-reviewed/2019/12/GHSA-hrqr-hxpp-chr3/GHSA-hrqr-hxpp-chr3.json
+++ b/advisories/github-reviewed/2019/12/GHSA-hrqr-hxpp-chr3/GHSA-hrqr-hxpp-chr3.json
@@ -67,6 +67,10 @@
       "type": "WEB",
       "url": "https://github.com/rack/rack/commit/7fecaee81f59926b6e1913511c90650e76673b38"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rack/rack"
+    },
     {
       "type": "WEB",
       "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/HZXMWILCICQLA2BYSP6I2CRMUG53YBLX/"
@@ -94,10 +98,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2020/04/09/2"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rack/rack"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/12/GHSA-pg36-wpm5-g57p/GHSA-pg36-wpm5-g57p.json b/advisories/github-reviewed/2019/12/GHSA-pg36-wpm5-g57p/GHSA-pg36-wpm5-g57p.json
index fc20b2287fe..320b2cb632d 100644
--- a/advisories/github-reviewed/2019/12/GHSA-pg36-wpm5-g57p/GHSA-pg36-wpm5-g57p.json
+++ b/advisories/github-reviewed/2019/12/GHSA-pg36-wpm5-g57p/GHSA-pg36-wpm5-g57p.json
@@ -64,6 +64,10 @@
       "type": "WEB",
       "url": "https://docs.pylonsproject.org/projects/waitress/en/latest/#security-fixes"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Pylons/waitress"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2022/05/msg00011.html"
@@ -79,10 +83,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuapr2022.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Pylons/waitress"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2019/12/GHSA-q58g-455p-8vw9/GHSA-q58g-455p-8vw9.json b/advisories/github-reviewed/2019/12/GHSA-q58g-455p-8vw9/GHSA-q58g-455p-8vw9.json
index 02cab9366eb..2ec45b6878c 100644
--- a/advisories/github-reviewed/2019/12/GHSA-q58g-455p-8vw9/GHSA-q58g-455p-8vw9.json
+++ b/advisories/github-reviewed/2019/12/GHSA-q58g-455p-8vw9/GHSA-q58g-455p-8vw9.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://github.com/excon/excon/commit/ccb57d7a422f020dc74f1de4e8fb505ab46d8a29"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/excon/excon"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/01/msg00015.html"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2020-01/msg00062.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/excon/excon"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/01/GHSA-fxph-q3j8-mv87/GHSA-fxph-q3j8-mv87.json b/advisories/github-reviewed/2020/01/GHSA-fxph-q3j8-mv87/GHSA-fxph-q3j8-mv87.json
index d68d570e5e6..f5a40e24bd8 100644
--- a/advisories/github-reviewed/2020/01/GHSA-fxph-q3j8-mv87/GHSA-fxph-q3j8-mv87.json
+++ b/advisories/github-reviewed/2020/01/GHSA-fxph-q3j8-mv87/GHSA-fxph-q3j8-mv87.json
@@ -135,6 +135,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2019:1545"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/apache/logging-log4j2"
+    },
     {
       "type": "WEB",
       "url": "https://issues.apache.org/jira/browse/LOG4J2-1863"
@@ -386,10 +390,6 @@
     {
       "type": "WEB",
       "url": "http://www.securitytracker.com/id/1041294"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/apache/logging-log4j2"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/01/GHSA-gf8j-v8x5-h9qp/GHSA-gf8j-v8x5-h9qp.json b/advisories/github-reviewed/2020/01/GHSA-gf8j-v8x5-h9qp/GHSA-gf8j-v8x5-h9qp.json
index e2f20c0d050..b5ce3055323 100644
--- a/advisories/github-reviewed/2020/01/GHSA-gf8j-v8x5-h9qp/GHSA-gf8j-v8x5-h9qp.json
+++ b/advisories/github-reviewed/2020/01/GHSA-gf8j-v8x5-h9qp/GHSA-gf8j-v8x5-h9qp.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/darylldoyle/svg-sanitizer/commit/51ca4b713f3706d6b27769c6296bbc0c28a5bbd0"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/darylldoyle/svg-sanitizer/compare/0.11.0...0.12.0"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/darylldoyle/svg-sanitizer"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/darylldoyle/svg-sanitizer/compare/0.11.0...0.12.0"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/01/GHSA-m8p2-495h-ccmh/GHSA-m8p2-495h-ccmh.json b/advisories/github-reviewed/2020/01/GHSA-m8p2-495h-ccmh/GHSA-m8p2-495h-ccmh.json
index f763eed6c66..d6fe84386ed 100644
--- a/advisories/github-reviewed/2020/01/GHSA-m8p2-495h-ccmh/GHSA-m8p2-495h-ccmh.json
+++ b/advisories/github-reviewed/2020/01/GHSA-m8p2-495h-ccmh/GHSA-m8p2-495h-ccmh.json
@@ -72,6 +72,10 @@
       "type": "WEB",
       "url": "https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2019-10219"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/hibernate/hibernate-validator"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/r4f8b4e2541be4234946e40d55859273a7eec0f4901e8080ce2406fe6@%3Cnotifications.accumulo.apache.org%3E"
@@ -103,10 +107,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpujan2022.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/hibernate/hibernate-validator"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/02/GHSA-84j7-475p-hp8v/GHSA-84j7-475p-hp8v.json b/advisories/github-reviewed/2020/02/GHSA-84j7-475p-hp8v/GHSA-84j7-475p-hp8v.json
index 460ba217914..65c188a5e45 100644
--- a/advisories/github-reviewed/2020/02/GHSA-84j7-475p-hp8v/GHSA-84j7-475p-hp8v.json
+++ b/advisories/github-reviewed/2020/02/GHSA-84j7-475p-hp8v/GHSA-84j7-475p-hp8v.json
@@ -73,6 +73,10 @@
       "type": "WEB",
       "url": "https://github.com/puma/puma/commit/c36491756f68a9d6a8b3a49e7e5eb07fe6f1332f"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/puma/puma"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2022/05/msg00034.html"
@@ -96,10 +100,6 @@
     {
       "type": "WEB",
       "url": "https://www.ruby-lang.org/en/news/2019/10/01/http-response-splitting-in-webrick-cve-2019-16254"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/puma/puma"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/02/GHSA-cchx-mfrc-fwqr/GHSA-cchx-mfrc-fwqr.json b/advisories/github-reviewed/2020/02/GHSA-cchx-mfrc-fwqr/GHSA-cchx-mfrc-fwqr.json
index 4413dedc0e7..26642826648 100644
--- a/advisories/github-reviewed/2020/02/GHSA-cchx-mfrc-fwqr/GHSA-cchx-mfrc-fwqr.json
+++ b/advisories/github-reviewed/2020/02/GHSA-cchx-mfrc-fwqr/GHSA-cchx-mfrc-fwqr.json
@@ -322,6 +322,10 @@
       "type": "WEB",
       "url": "https://github.com/FriendsOfPHP/security-advisories/blob/master/symfony/symfony/CVE-2019-10911.yaml"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/symfony/symfony "
+    },
     {
       "type": "WEB",
       "url": "https://symfony.com/blog/cve-2019-10911-add-a-separator-in-the-remember-me-cookie-hash"
@@ -333,10 +337,6 @@
     {
       "type": "WEB",
       "url": "https://www.synology.com/security/advisory/Synology_SA_19_19"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/symfony/symfony "
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/02/GHSA-cqqj-4p63-rrmm/GHSA-cqqj-4p63-rrmm.json b/advisories/github-reviewed/2020/02/GHSA-cqqj-4p63-rrmm/GHSA-cqqj-4p63-rrmm.json
index faa2ac9f781..0e18242b426 100644
--- a/advisories/github-reviewed/2020/02/GHSA-cqqj-4p63-rrmm/GHSA-cqqj-4p63-rrmm.json
+++ b/advisories/github-reviewed/2020/02/GHSA-cqqj-4p63-rrmm/GHSA-cqqj-4p63-rrmm.json
@@ -84,6 +84,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2020:0811"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/netty/netty"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/netty/netty/compare/netty-4.1.43.Final...netty-4.1.44.Final"
@@ -307,10 +311,6 @@
     {
       "type": "WEB",
       "url": "https://www.debian.org/security/2021/dsa-4885"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/netty/netty"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/02/GHSA-hmr4-m2h5-33qx/GHSA-hmr4-m2h5-33qx.json b/advisories/github-reviewed/2020/02/GHSA-hmr4-m2h5-33qx/GHSA-hmr4-m2h5-33qx.json
index a8d18d1d984..4cdda838b1d 100644
--- a/advisories/github-reviewed/2020/02/GHSA-hmr4-m2h5-33qx/GHSA-hmr4-m2h5-33qx.json
+++ b/advisories/github-reviewed/2020/02/GHSA-hmr4-m2h5-33qx/GHSA-hmr4-m2h5-33qx.json
@@ -97,6 +97,10 @@
       "type": "WEB",
       "url": "https://github.com/django/django/commit/eb31d845323618d688ad429479c6dda973056136"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/django/django"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/forum/#!topic/django-announce/X45S86X5bZI"
@@ -136,10 +140,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2020/02/03/1"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/django/django"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/02/GHSA-p2v9-g2qv-p635/GHSA-p2v9-g2qv-p635.json b/advisories/github-reviewed/2020/02/GHSA-p2v9-g2qv-p635/GHSA-p2v9-g2qv-p635.json
index 55163822b48..3eaca789f8b 100644
--- a/advisories/github-reviewed/2020/02/GHSA-p2v9-g2qv-p635/GHSA-p2v9-g2qv-p635.json
+++ b/advisories/github-reviewed/2020/02/GHSA-p2v9-g2qv-p635/GHSA-p2v9-g2qv-p635.json
@@ -81,6 +81,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2020:0811"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/netty/netty"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/netty/netty/compare/netty-4.1.43.Final...netty-4.1.44.Final"
@@ -256,10 +260,6 @@
     {
       "type": "WEB",
       "url": "https://www.debian.org/security/2021/dsa-4885"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/netty/netty"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/02/GHSA-wp7m-mrvf-599c/GHSA-wp7m-mrvf-599c.json b/advisories/github-reviewed/2020/02/GHSA-wp7m-mrvf-599c/GHSA-wp7m-mrvf-599c.json
index cbf0bd5c1b4..8c33b9e64e2 100644
--- a/advisories/github-reviewed/2020/02/GHSA-wp7m-mrvf-599c/GHSA-wp7m-mrvf-599c.json
+++ b/advisories/github-reviewed/2020/02/GHSA-wp7m-mrvf-599c/GHSA-wp7m-mrvf-599c.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://hackerone.com/reports/703412"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/1431"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/adriano-di-giovanni/node-df"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/1431"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/03/GHSA-4w82-r329-3q67/GHSA-4w82-r329-3q67.json b/advisories/github-reviewed/2020/03/GHSA-4w82-r329-3q67/GHSA-4w82-r329-3q67.json
index bff4cd5a33f..614386ac01e 100644
--- a/advisories/github-reviewed/2020/03/GHSA-4w82-r329-3q67/GHSA-4w82-r329-3q67.json
+++ b/advisories/github-reviewed/2020/03/GHSA-4w82-r329-3q67/GHSA-4w82-r329-3q67.json
@@ -125,6 +125,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/commit/9bb52c7122271df75435ec7e66ecf6b02b1ee14f"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/r078e68a926ea6be12e8404e47f45aabf04bb4668e8265c0de41db6db@%3Ccommits.druid.apache.org%3E"
@@ -296,10 +300,6 @@
     {
       "type": "WEB",
       "url": "http://www.huawei.com/en/psirt/security-advisories/huawei-sa-20200610-01-fastjason-en"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/03/GHSA-694p-xrhg-x3wm/GHSA-694p-xrhg-x3wm.json b/advisories/github-reviewed/2020/03/GHSA-694p-xrhg-x3wm/GHSA-694p-xrhg-x3wm.json
index 6a053d75a09..6e3cffd2548 100644
--- a/advisories/github-reviewed/2020/03/GHSA-694p-xrhg-x3wm/GHSA-694p-xrhg-x3wm.json
+++ b/advisories/github-reviewed/2020/03/GHSA-694p-xrhg-x3wm/GHSA-694p-xrhg-x3wm.json
@@ -75,13 +75,13 @@
       "type": "WEB",
       "url": "https://github.com/micronaut-projects/micronaut-core/commit/bc855e439c4a5ced3d83195bb59d0679cbd95add"
     },
-    {
-      "type": "WEB",
-      "url": "https://snyk.io/vuln/SNYK-JAVA-IOMICRONAUT-561342"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/micronaut-projects/micronaut-core"
+    },
+    {
+      "type": "WEB",
+      "url": "https://snyk.io/vuln/SNYK-JAVA-IOMICRONAUT-561342"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/03/GHSA-7q25-qrjw-6fg2/GHSA-7q25-qrjw-6fg2.json b/advisories/github-reviewed/2020/03/GHSA-7q25-qrjw-6fg2/GHSA-7q25-qrjw-6fg2.json
index 670d2a3ed83..b988dc8d9fe 100644
--- a/advisories/github-reviewed/2020/03/GHSA-7q25-qrjw-6fg2/GHSA-7q25-qrjw-6fg2.json
+++ b/advisories/github-reviewed/2020/03/GHSA-7q25-qrjw-6fg2/GHSA-7q25-qrjw-6fg2.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://github.com/akoumjian/python-safety-vuln"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/pyupio/safety"
+    },
     {
       "type": "WEB",
       "url": "https://mulch.dev/blog/CVE-2020-5252-python-safety-vuln/"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://pyup.io/posts/patched-vulnerability/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/pyupio/safety"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/03/GHSA-gww7-p5w4-wrfv/GHSA-gww7-p5w4-wrfv.json b/advisories/github-reviewed/2020/03/GHSA-gww7-p5w4-wrfv/GHSA-gww7-p5w4-wrfv.json
index 26f65d7f64a..7f883e122fb 100644
--- a/advisories/github-reviewed/2020/03/GHSA-gww7-p5w4-wrfv/GHSA-gww7-p5w4-wrfv.json
+++ b/advisories/github-reviewed/2020/03/GHSA-gww7-p5w4-wrfv/GHSA-gww7-p5w4-wrfv.json
@@ -113,6 +113,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2526"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/compare/jackson-databind-2.9.10.1...jackson-databind-2.9.10.2"
@@ -236,10 +240,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2020.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/03/GHSA-h96w-mmrf-2h6v/GHSA-h96w-mmrf-2h6v.json b/advisories/github-reviewed/2020/03/GHSA-h96w-mmrf-2h6v/GHSA-h96w-mmrf-2h6v.json
index 1722926f653..7a4762d4d73 100644
--- a/advisories/github-reviewed/2020/03/GHSA-h96w-mmrf-2h6v/GHSA-h96w-mmrf-2h6v.json
+++ b/advisories/github-reviewed/2020/03/GHSA-h96w-mmrf-2h6v/GHSA-h96w-mmrf-2h6v.json
@@ -46,6 +46,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2020-10108"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/twisted/twisted"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/twisted/twisted/blob/6ff2c40e42416c83203422ff70dfc49d2681c8e2/NEWS.rst#twisted-2030-2020-03-13"
@@ -81,10 +85,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2020.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/twisted/twisted"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/03/GHSA-p5xh-vx83-mxcj/GHSA-p5xh-vx83-mxcj.json b/advisories/github-reviewed/2020/03/GHSA-p5xh-vx83-mxcj/GHSA-p5xh-vx83-mxcj.json
index cc0fe238d57..1cb2d37fdf5 100644
--- a/advisories/github-reviewed/2020/03/GHSA-p5xh-vx83-mxcj/GHSA-p5xh-vx83-mxcj.json
+++ b/advisories/github-reviewed/2020/03/GHSA-p5xh-vx83-mxcj/GHSA-p5xh-vx83-mxcj.json
@@ -50,6 +50,10 @@
       "type": "WEB",
       "url": "https://github.com/twisted/twisted/commit/4a7d22e490bb8ff836892cc99a1f54b85ccb0281"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/twisted/twisted"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/twisted/twisted/blob/6ff2c40e42416c83203422ff70dfc49d2681c8e2/NEWS.rst#twisted-2030-2020-03-13"
@@ -81,10 +85,6 @@
     {
       "type": "WEB",
       "url": "https://usn.ubuntu.com/4308-2/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/twisted/twisted"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/03/GHSA-wh37-37xw-54hr/GHSA-wh37-37xw-54hr.json b/advisories/github-reviewed/2020/03/GHSA-wh37-37xw-54hr/GHSA-wh37-37xw-54hr.json
index d117810da5e..f7f338b7f17 100644
--- a/advisories/github-reviewed/2020/03/GHSA-wh37-37xw-54hr/GHSA-wh37-37xw-54hr.json
+++ b/advisories/github-reviewed/2020/03/GHSA-wh37-37xw-54hr/GHSA-wh37-37xw-54hr.json
@@ -61,6 +61,10 @@
       "type": "WEB",
       "url": "https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2014-8650"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mkomitee/requests-kerberos"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/requests/requests-kerberos/blob/0.6/HISTORY.rst"
@@ -76,10 +80,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/70909"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/mkomitee/requests-kerberos"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-5p34-5m6p-p58g/GHSA-5p34-5m6p-p58g.json b/advisories/github-reviewed/2020/04/GHSA-5p34-5m6p-p58g/GHSA-5p34-5m6p-p58g.json
index 4e3ebe246ed..0e5e02df7fe 100644
--- a/advisories/github-reviewed/2020/04/GHSA-5p34-5m6p-p58g/GHSA-5p34-5m6p-p58g.json
+++ b/advisories/github-reviewed/2020/04/GHSA-5p34-5m6p-p58g/GHSA-5p34-5m6p-p58g.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2631"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/r35d30db00440ef63b791c4b7f7acb036e14d4a23afa2a249cb66c0fd@%3Cissues.zookeeper.apache.org%3E"
@@ -110,10 +114,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-6gp3-h3jj-prx4/GHSA-6gp3-h3jj-prx4.json b/advisories/github-reviewed/2020/04/GHSA-6gp3-h3jj-prx4/GHSA-6gp3-h3jj-prx4.json
index 3a1d7e1fc6c..a4314a64688 100644
--- a/advisories/github-reviewed/2020/04/GHSA-6gp3-h3jj-prx4/GHSA-6gp3-h3jj-prx4.json
+++ b/advisories/github-reviewed/2020/04/GHSA-6gp3-h3jj-prx4/GHSA-6gp3-h3jj-prx4.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/typestack/class-transformer/commit/8f04eb9db02de708f1a20f6f2d2bb309b2fed01e"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/typestack/class-transformer"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/typestack/class-transformer/blob/a650d9f490573443f62508bc063b857bcd5e2525/src/ClassTransformer.ts#L29-L31,"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JS-CLASSTRANSFORMER-564431"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/typestack/class-transformer"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-758m-v56v-grj4/GHSA-758m-v56v-grj4.json b/advisories/github-reviewed/2020/04/GHSA-758m-v56v-grj4/GHSA-758m-v56v-grj4.json
index 2da523ba250..6d7747e8d3f 100644
--- a/advisories/github-reviewed/2020/04/GHSA-758m-v56v-grj4/GHSA-758m-v56v-grj4.json
+++ b/advisories/github-reviewed/2020/04/GHSA-758m-v56v-grj4/GHSA-758m-v56v-grj4.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2642"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/04/msg00012.html"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-8qxj-f9rh-9fg2/GHSA-8qxj-f9rh-9fg2.json b/advisories/github-reviewed/2020/04/GHSA-8qxj-f9rh-9fg2/GHSA-8qxj-f9rh-9fg2.json
index f71400eac2b..bf44a0cbc14 100644
--- a/advisories/github-reviewed/2020/04/GHSA-8qxj-f9rh-9fg2/GHSA-8qxj-f9rh-9fg2.json
+++ b/advisories/github-reviewed/2020/04/GHSA-8qxj-f9rh-9fg2/GHSA-8qxj-f9rh-9fg2.json
@@ -65,6 +65,10 @@
       "type": "WEB",
       "url": "https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2019-14859"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/warner/python-ecdsa"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/warner/python-ecdsa/releases/tag/python-ecdsa-0.13.3"
@@ -72,10 +76,6 @@
     {
       "type": "WEB",
       "url": "https://pypi.org/project/ecdsa/0.13.3/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/warner/python-ecdsa"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-95cm-88f5-f2c7/GHSA-95cm-88f5-f2c7.json b/advisories/github-reviewed/2020/04/GHSA-95cm-88f5-f2c7/GHSA-95cm-88f5-f2c7.json
index 2ba87dbe1cb..6741560b521 100644
--- a/advisories/github-reviewed/2020/04/GHSA-95cm-88f5-f2c7/GHSA-95cm-88f5-f2c7.json
+++ b/advisories/github-reviewed/2020/04/GHSA-95cm-88f5-f2c7/GHSA-95cm-88f5-f2c7.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2659"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/03/msg00027.html"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-gqgv-6jq5-jjj9/GHSA-gqgv-6jq5-jjj9.json b/advisories/github-reviewed/2020/04/GHSA-gqgv-6jq5-jjj9/GHSA-gqgv-6jq5-jjj9.json
index 85615fa6822..346d7b3c640 100644
--- a/advisories/github-reviewed/2020/04/GHSA-gqgv-6jq5-jjj9/GHSA-gqgv-6jq5-jjj9.json
+++ b/advisories/github-reviewed/2020/04/GHSA-gqgv-6jq5-jjj9/GHSA-gqgv-6jq5-jjj9.json
@@ -109,6 +109,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2017:2672"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/ljharb/qs"
+    },
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/npm:qs:20170213"
@@ -116,10 +120,6 @@
     {
       "type": "WEB",
       "url": "https://www.npmjs.com/advisories/1469"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/ljharb/qs"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-q8xg-8xwf-m598/GHSA-q8xg-8xwf-m598.json b/advisories/github-reviewed/2020/04/GHSA-q8xg-8xwf-m598/GHSA-q8xg-8xwf-m598.json
index 4239890b3fb..984f249464a 100644
--- a/advisories/github-reviewed/2020/04/GHSA-q8xg-8xwf-m598/GHSA-q8xg-8xwf-m598.json
+++ b/advisories/github-reviewed/2020/04/GHSA-q8xg-8xwf-m598/GHSA-q8xg-8xwf-m598.json
@@ -40,13 +40,13 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2020-10800"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/1306"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/lix-pm/lix.client"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/1306"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-qh4w-7pw3-p4rp/GHSA-qh4w-7pw3-p4rp.json b/advisories/github-reviewed/2020/04/GHSA-qh4w-7pw3-p4rp/GHSA-qh4w-7pw3-p4rp.json
index becdabbe2a0..ecce27fb0d0 100644
--- a/advisories/github-reviewed/2020/04/GHSA-qh4w-7pw3-p4rp/GHSA-qh4w-7pw3-p4rp.json
+++ b/advisories/github-reviewed/2020/04/GHSA-qh4w-7pw3-p4rp/GHSA-qh4w-7pw3-p4rp.json
@@ -56,6 +56,10 @@
       "type": "WEB",
       "url": "https://bugzilla.redhat.com/show_bug.cgi?id=1229706"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/mongodb/bson-ruby"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/mongodb/bson-ruby/compare/7446d7c6764dfda8dc4480ce16d5c023e74be5ca...28f34978a85b689a4480b4d343389bf4886522e7"
@@ -95,10 +99,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/75045"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/mongodb/bson-ruby"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/04/GHSA-vh95-rmgr-6w4m/GHSA-vh95-rmgr-6w4m.json b/advisories/github-reviewed/2020/04/GHSA-vh95-rmgr-6w4m/GHSA-vh95-rmgr-6w4m.json
index 78e21ae785f..97d1acb691a 100644
--- a/advisories/github-reviewed/2020/04/GHSA-vh95-rmgr-6w4m/GHSA-vh95-rmgr-6w4m.json
+++ b/advisories/github-reviewed/2020/04/GHSA-vh95-rmgr-6w4m/GHSA-vh95-rmgr-6w4m.json
@@ -71,6 +71,10 @@
       "type": "WEB",
       "url": "https://github.com/substack/minimist/commit/63e7ed05aa4b1889ec2f3b196426db4500cbda94"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/substack/minimist"
+    },
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JS-MINIMIST-559764"
@@ -82,10 +86,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2020-06/msg00024.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/substack/minimist"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-27xj-rqx5-2255/GHSA-27xj-rqx5-2255.json b/advisories/github-reviewed/2020/05/GHSA-27xj-rqx5-2255/GHSA-27xj-rqx5-2255.json
index e340c33219c..fdbf6b39a8e 100644
--- a/advisories/github-reviewed/2020/05/GHSA-27xj-rqx5-2255/GHSA-27xj-rqx5-2255.json
+++ b/advisories/github-reviewed/2020/05/GHSA-27xj-rqx5-2255/GHSA-27xj-rqx5-2255.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2680"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/rf1bbc0ea4a9f014cf94df9a12a6477d24a27f52741dbc87f2fd52ff2@%3Cissues.geode.apache.org%3E"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2020.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-2m7g-9q74-9m3q/GHSA-2m7g-9q74-9m3q.json b/advisories/github-reviewed/2020/05/GHSA-2m7g-9q74-9m3q/GHSA-2m7g-9q74-9m3q.json
index e2f2033eb13..d5fc3c8ef4d 100644
--- a/advisories/github-reviewed/2020/05/GHSA-2m7g-9q74-9m3q/GHSA-2m7g-9q74-9m3q.json
+++ b/advisories/github-reviewed/2020/05/GHSA-2m7g-9q74-9m3q/GHSA-2m7g-9q74-9m3q.json
@@ -47,13 +47,13 @@
       "type": "WEB",
       "url": "https://github.com/apache/beam/commit/a7dd23d95d2d214b4110781b5a28802bd43b834b"
     },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/rdd0e85b71bf0274471b40fa1396d77f7b2d1165eaea4becbdc69aa04%40%3Cuser.beam.apache.org%3E"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/apache/beam"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/rdd0e85b71bf0274471b40fa1396d77f7b2d1165eaea4becbdc69aa04%40%3Cuser.beam.apache.org%3E"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-46j2-xjgp-jrfm/GHSA-46j2-xjgp-jrfm.json b/advisories/github-reviewed/2020/05/GHSA-46j2-xjgp-jrfm/GHSA-46j2-xjgp-jrfm.json
index 5c69adf9ed0..2f6974c7e84 100644
--- a/advisories/github-reviewed/2020/05/GHSA-46j2-xjgp-jrfm/GHSA-46j2-xjgp-jrfm.json
+++ b/advisories/github-reviewed/2020/05/GHSA-46j2-xjgp-jrfm/GHSA-46j2-xjgp-jrfm.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/rails/activeresource/commit/0de18f7e96fa90bbf23b16ac11980bc2cb6a716e"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/rails/activeresource"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/forum/#!topic/rubyonrails-security/pktoF4VmiM8"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/P7B7A4H22DZ522HLDS3JX3NX2CXIOZSR/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/rails/activeresource"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-5mh9-r3rr-9597/GHSA-5mh9-r3rr-9597.json b/advisories/github-reviewed/2020/05/GHSA-5mh9-r3rr-9597/GHSA-5mh9-r3rr-9597.json
index f85f4243b15..86bb77c7775 100644
--- a/advisories/github-reviewed/2020/05/GHSA-5mh9-r3rr-9597/GHSA-5mh9-r3rr-9597.json
+++ b/advisories/github-reviewed/2020/05/GHSA-5mh9-r3rr-9597/GHSA-5mh9-r3rr-9597.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/HtmlUnit/htmlunit/commit/bc1f58d483cc8854a9c4c1739abd5e04a2eb0367"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/HtmlUnit/htmlunit"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/HtmlUnit/htmlunit/releases/tag/2.37.0"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "https://usn.ubuntu.com/4584-1/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/HtmlUnit/htmlunit"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-9vvp-fxw6-jcxr/GHSA-9vvp-fxw6-jcxr.json b/advisories/github-reviewed/2020/05/GHSA-9vvp-fxw6-jcxr/GHSA-9vvp-fxw6-jcxr.json
index 465a7718616..311c85c97eb 100644
--- a/advisories/github-reviewed/2020/05/GHSA-9vvp-fxw6-jcxr/GHSA-9vvp-fxw6-jcxr.json
+++ b/advisories/github-reviewed/2020/05/GHSA-9vvp-fxw6-jcxr/GHSA-9vvp-fxw6-jcxr.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2670"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/04/msg00012.html"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-cxvr-r92m-q9hw/GHSA-cxvr-r92m-q9hw.json b/advisories/github-reviewed/2020/05/GHSA-cxvr-r92m-q9hw/GHSA-cxvr-r92m-q9hw.json
index d17746b28f7..4c60e037ffd 100644
--- a/advisories/github-reviewed/2020/05/GHSA-cxvr-r92m-q9hw/GHSA-cxvr-r92m-q9hw.json
+++ b/advisories/github-reviewed/2020/05/GHSA-cxvr-r92m-q9hw/GHSA-cxvr-r92m-q9hw.json
@@ -40,6 +40,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2020-13094"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/Dolibarr/dolibarr/"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/Dolibarr/dolibarr/blob/11.0.4/ChangeLog"
@@ -51,10 +55,6 @@
     {
       "type": "WEB",
       "url": "http://packetstormsecurity.com/files/157752/Dolibarr-11.0.3-Cross-Site-Scripting.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/Dolibarr/dolibarr/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-f7hx-fqxw-rvvj/GHSA-f7hx-fqxw-rvvj.json b/advisories/github-reviewed/2020/05/GHSA-f7hx-fqxw-rvvj/GHSA-f7hx-fqxw-rvvj.json
index 4e5cd51fa9b..848c3515dee 100644
--- a/advisories/github-reviewed/2020/05/GHSA-f7hx-fqxw-rvvj/GHSA-f7hx-fqxw-rvvj.json
+++ b/advisories/github-reviewed/2020/05/GHSA-f7hx-fqxw-rvvj/GHSA-f7hx-fqxw-rvvj.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://github.com/PHPMailer/PHPMailer/commit/c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/PHPMailer/PHPMailer"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/PHPMailer/PHPMailer/releases/tag/v6.1.6"
@@ -79,10 +83,6 @@
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2020-07/msg00085.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/PHPMailer/PHPMailer"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-fqwf-pjwf-7vqv/GHSA-fqwf-pjwf-7vqv.json b/advisories/github-reviewed/2020/05/GHSA-fqwf-pjwf-7vqv/GHSA-fqwf-pjwf-7vqv.json
index e5aa60d76f5..9dc33438ba5 100644
--- a/advisories/github-reviewed/2020/05/GHSA-fqwf-pjwf-7vqv/GHSA-fqwf-pjwf-7vqv.json
+++ b/advisories/github-reviewed/2020/05/GHSA-fqwf-pjwf-7vqv/GHSA-fqwf-pjwf-7vqv.json
@@ -44,6 +44,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2660"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/03/msg00027.html"
@@ -71,10 +75,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-h98h-8mxr-m8gx/GHSA-h98h-8mxr-m8gx.json b/advisories/github-reviewed/2020/05/GHSA-h98h-8mxr-m8gx/GHSA-h98h-8mxr-m8gx.json
index b89848a1f7b..7a4d5c5cb01 100644
--- a/advisories/github-reviewed/2020/05/GHSA-h98h-8mxr-m8gx/GHSA-h98h-8mxr-m8gx.json
+++ b/advisories/github-reviewed/2020/05/GHSA-h98h-8mxr-m8gx/GHSA-h98h-8mxr-m8gx.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/tensorflow/tensorflow/commit/49f73c55d56edffebde4bca4a407ad69c1cae433"
     },
-    {
-      "type": "WEB",
-      "url": "https://github.com/tensorflow/tensorflow/blob/master/tensorflow/security/advisory/tfsa-2018-001.md"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/tensorflow/tensorflow/"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/tensorflow/tensorflow/blob/master/tensorflow/security/advisory/tfsa-2018-001.md"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-m8xj-5v73-3hh8/GHSA-m8xj-5v73-3hh8.json b/advisories/github-reviewed/2020/05/GHSA-m8xj-5v73-3hh8/GHSA-m8xj-5v73-3hh8.json
index b58cccdb77a..d0d972dd939 100644
--- a/advisories/github-reviewed/2020/05/GHSA-m8xj-5v73-3hh8/GHSA-m8xj-5v73-3hh8.json
+++ b/advisories/github-reviewed/2020/05/GHSA-m8xj-5v73-3hh8/GHSA-m8xj-5v73-3hh8.json
@@ -40,6 +40,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2020-7646"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/node-js-libs/curlrequest"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/node-js-libs/curlrequest/blob/master/index.js#L239,"
@@ -47,10 +51,6 @@
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JS-CURLREQUEST-568274"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/node-js-libs/curlrequest"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-p43x-xfjf-5jhr/GHSA-p43x-xfjf-5jhr.json b/advisories/github-reviewed/2020/05/GHSA-p43x-xfjf-5jhr/GHSA-p43x-xfjf-5jhr.json
index 07db79bcc6b..454288abe64 100644
--- a/advisories/github-reviewed/2020/05/GHSA-p43x-xfjf-5jhr/GHSA-p43x-xfjf-5jhr.json
+++ b/advisories/github-reviewed/2020/05/GHSA-p43x-xfjf-5jhr/GHSA-p43x-xfjf-5jhr.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2634"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/r35d30db00440ef63b791c4b7f7acb036e14d4a23afa2a249cb66c0fd@%3Cissues.zookeeper.apache.org%3E"
@@ -106,10 +110,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-px9h-x66r-8mpc/GHSA-px9h-x66r-8mpc.json b/advisories/github-reviewed/2020/05/GHSA-px9h-x66r-8mpc/GHSA-px9h-x66r-8mpc.json
index f316bdf0062..f76c8655a7f 100644
--- a/advisories/github-reviewed/2020/05/GHSA-px9h-x66r-8mpc/GHSA-px9h-x66r-8mpc.json
+++ b/advisories/github-reviewed/2020/05/GHSA-px9h-x66r-8mpc/GHSA-px9h-x66r-8mpc.json
@@ -67,6 +67,10 @@
       "type": "WEB",
       "url": "https://github.com/jooby-project/jooby/commit/34f526028e6cd0652125baa33936ffb6a8a4a009"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/jooby-project/jooby"
+    },
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JAVA-IOJOOBY-568806"
@@ -82,10 +86,6 @@
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JAVA-ORGJOOBY-568807,"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/jooby-project/jooby"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-q93h-jc49-78gg/GHSA-q93h-jc49-78gg.json b/advisories/github-reviewed/2020/05/GHSA-q93h-jc49-78gg/GHSA-q93h-jc49-78gg.json
index 19893ddc5c6..d82ef93f6ee 100644
--- a/advisories/github-reviewed/2020/05/GHSA-q93h-jc49-78gg/GHSA-q93h-jc49-78gg.json
+++ b/advisories/github-reviewed/2020/05/GHSA-q93h-jc49-78gg/GHSA-q93h-jc49-78gg.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2634"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/r35d30db00440ef63b791c4b7f7acb036e14d4a23afa2a249cb66c0fd@%3Cissues.zookeeper.apache.org%3E"
@@ -134,10 +138,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-r5jw-62xg-j433/GHSA-r5jw-62xg-j433.json b/advisories/github-reviewed/2020/05/GHSA-r5jw-62xg-j433/GHSA-r5jw-62xg-j433.json
index c6506b266ea..022b92a83ad 100644
--- a/advisories/github-reviewed/2020/05/GHSA-r5jw-62xg-j433/GHSA-r5jw-62xg-j433.json
+++ b/advisories/github-reviewed/2020/05/GHSA-r5jw-62xg-j433/GHSA-r5jw-62xg-j433.json
@@ -52,6 +52,10 @@
       "type": "WEB",
       "url": "https://github.com/kaminari/kaminari/commit/8dd52a1aed3d2fa2835d836de23fc0d8c4ff5db8"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/kaminari/kaminari"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2021/09/msg00011.html"
@@ -59,10 +63,6 @@
     {
       "type": "WEB",
       "url": "https://www.debian.org/security/2021/dsa-5005"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/kaminari/kaminari"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-r854-96gq-rfg3/GHSA-r854-96gq-rfg3.json b/advisories/github-reviewed/2020/05/GHSA-r854-96gq-rfg3/GHSA-r854-96gq-rfg3.json
index 4aaeb844f96..add8c9ceadb 100644
--- a/advisories/github-reviewed/2020/05/GHSA-r854-96gq-rfg3/GHSA-r854-96gq-rfg3.json
+++ b/advisories/github-reviewed/2020/05/GHSA-r854-96gq-rfg3/GHSA-r854-96gq-rfg3.json
@@ -41,6 +41,10 @@
       "type": "WEB",
       "url": "https://github.com/python-imaging/Pillow/commit/4e9f367dfd3f04c8f5d23f7f759ec12782e10ee7"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/python-imaging/Pillow"
+    },
     {
       "type": "WEB",
       "url": "https://security.gentoo.org/glsa/201612-52"
@@ -64,10 +68,6 @@
     {
       "type": "WEB",
       "url": "http://www.ubuntu.com/usn/USN-2168-1"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/python-imaging/Pillow"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-rc77-xxq6-4mff/GHSA-rc77-xxq6-4mff.json b/advisories/github-reviewed/2020/05/GHSA-rc77-xxq6-4mff/GHSA-rc77-xxq6-4mff.json
index e5d0601befa..a7b98f89511 100644
--- a/advisories/github-reviewed/2020/05/GHSA-rc77-xxq6-4mff/GHSA-rc77-xxq6-4mff.json
+++ b/advisories/github-reviewed/2020/05/GHSA-rc77-xxq6-4mff/GHSA-rc77-xxq6-4mff.json
@@ -52,13 +52,13 @@
       "type": "WEB",
       "url": "https://blog.truesec.com/2020/01/17/reverse-shell-through-a-node-js-math-parser/"
     },
-    {
-      "type": "WEB",
-      "url": "https://www.npmjs.com/advisories/1439"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/handsontable/formula-parser"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.npmjs.com/advisories/1439"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-rf6r-2c4q-2vwg/GHSA-rf6r-2c4q-2vwg.json b/advisories/github-reviewed/2020/05/GHSA-rf6r-2c4q-2vwg/GHSA-rf6r-2c4q-2vwg.json
index b66e562993e..76d2562bc1b 100644
--- a/advisories/github-reviewed/2020/05/GHSA-rf6r-2c4q-2vwg/GHSA-rf6r-2c4q-2vwg.json
+++ b/advisories/github-reviewed/2020/05/GHSA-rf6r-2c4q-2vwg/GHSA-rf6r-2c4q-2vwg.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2662"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind/"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/04/msg00012.html"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-rjvg-q57v-mjjc/GHSA-rjvg-q57v-mjjc.json b/advisories/github-reviewed/2020/05/GHSA-rjvg-q57v-mjjc/GHSA-rjvg-q57v-mjjc.json
index bb312371528..6fc3c346204 100644
--- a/advisories/github-reviewed/2020/05/GHSA-rjvg-q57v-mjjc/GHSA-rjvg-q57v-mjjc.json
+++ b/advisories/github-reviewed/2020/05/GHSA-rjvg-q57v-mjjc/GHSA-rjvg-q57v-mjjc.json
@@ -40,6 +40,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2019-12398"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/apache/airflow"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/apache/airflow/blob/1.10.5/CHANGELOG.txt"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "http://www.openwall.com/lists/oss-security/2020/01/14/2"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/apache/airflow"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/05/GHSA-v3xw-c963-f5hc/GHSA-v3xw-c963-f5hc.json b/advisories/github-reviewed/2020/05/GHSA-v3xw-c963-f5hc/GHSA-v3xw-c963-f5hc.json
index 2aa10f10082..b63653e541f 100644
--- a/advisories/github-reviewed/2020/05/GHSA-v3xw-c963-f5hc/GHSA-v3xw-c963-f5hc.json
+++ b/advisories/github-reviewed/2020/05/GHSA-v3xw-c963-f5hc/GHSA-v3xw-c963-f5hc.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2664"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/04/msg00012.html"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-2m34-jcjv-45xf/GHSA-2m34-jcjv-45xf.json b/advisories/github-reviewed/2020/06/GHSA-2m34-jcjv-45xf/GHSA-2m34-jcjv-45xf.json
index 18b406dac1f..f89ed0d8190 100644
--- a/advisories/github-reviewed/2020/06/GHSA-2m34-jcjv-45xf/GHSA-2m34-jcjv-45xf.json
+++ b/advisories/github-reviewed/2020/06/GHSA-2m34-jcjv-45xf/GHSA-2m34-jcjv-45xf.json
@@ -63,6 +63,10 @@
       "type": "WEB",
       "url": "https://docs.djangoproject.com/en/3.0/releases/security/"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/django/django"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/forum/#!msg/django-announce/pPEmb2ot4Fo/X-SMalYSBAAJ"
@@ -94,10 +98,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpujan2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/django/django"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-338v-3958-8v8r/GHSA-338v-3958-8v8r.json b/advisories/github-reviewed/2020/06/GHSA-338v-3958-8v8r/GHSA-338v-3958-8v8r.json
index a6a93fafabc..f0c1e9828bf 100644
--- a/advisories/github-reviewed/2020/06/GHSA-338v-3958-8v8r/GHSA-338v-3958-8v8r.json
+++ b/advisories/github-reviewed/2020/06/GHSA-338v-3958-8v8r/GHSA-338v-3958-8v8r.json
@@ -57,6 +57,10 @@
       "type": "WEB",
       "url": "https://github.com/victims/victims-cve-db/blob/master/database/java/2014/8122.yaml"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/weld/core/"
+    },
     {
       "type": "WEB",
       "url": "http://rhn.redhat.com/errata/RHSA-2015-0215.html"
@@ -100,10 +104,6 @@
     {
       "type": "WEB",
       "url": "http://www.securitytracker.com/id/1031741"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/weld/core/"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-3gh2-xw74-jmcw/GHSA-3gh2-xw74-jmcw.json b/advisories/github-reviewed/2020/06/GHSA-3gh2-xw74-jmcw/GHSA-3gh2-xw74-jmcw.json
index 60175ddc283..aa66e9ffc09 100644
--- a/advisories/github-reviewed/2020/06/GHSA-3gh2-xw74-jmcw/GHSA-3gh2-xw74-jmcw.json
+++ b/advisories/github-reviewed/2020/06/GHSA-3gh2-xw74-jmcw/GHSA-3gh2-xw74-jmcw.json
@@ -82,6 +82,10 @@
       "type": "WEB",
       "url": "https://docs.djangoproject.com/en/3.0/releases/security/"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/django/django"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/forum/#!topic/django-announce/fLUh_pOaKrY"
@@ -117,10 +121,6 @@
     {
       "type": "WEB",
       "url": "https://www.djangoproject.com/weblog/2020/mar/04/security-releases/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/django/django"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-58pp-9c76-5625/GHSA-58pp-9c76-5625.json b/advisories/github-reviewed/2020/06/GHSA-58pp-9c76-5625/GHSA-58pp-9c76-5625.json
index a0fa4e63c40..96322a4dc88 100644
--- a/advisories/github-reviewed/2020/06/GHSA-58pp-9c76-5625/GHSA-58pp-9c76-5625.json
+++ b/advisories/github-reviewed/2020/06/GHSA-58pp-9c76-5625/GHSA-58pp-9c76-5625.json
@@ -47,6 +47,10 @@
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/issues/2666"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/04/msg00012.html"
@@ -74,10 +78,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-6wqp-v4v6-c87c/GHSA-6wqp-v4v6-c87c.json b/advisories/github-reviewed/2020/06/GHSA-6wqp-v4v6-c87c/GHSA-6wqp-v4v6-c87c.json
index dc1273dcacc..409b915392a 100644
--- a/advisories/github-reviewed/2020/06/GHSA-6wqp-v4v6-c87c/GHSA-6wqp-v4v6-c87c.json
+++ b/advisories/github-reviewed/2020/06/GHSA-6wqp-v4v6-c87c/GHSA-6wqp-v4v6-c87c.json
@@ -164,6 +164,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2019:4037"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/519eb0fd45642dcecd9ff74cb3e71c20a4753f7d82e2f07864b5108f@%3Cdev.drill.apache.org%3E"
@@ -231,10 +235,6 @@
     {
       "type": "WEB",
       "url": "http://www.securityfocus.com/bid/105659"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-864j-6qpp-cmrr/GHSA-864j-6qpp-cmrr.json b/advisories/github-reviewed/2020/06/GHSA-864j-6qpp-cmrr/GHSA-864j-6qpp-cmrr.json
index f11e5d1b012..9b2a548304c 100644
--- a/advisories/github-reviewed/2020/06/GHSA-864j-6qpp-cmrr/GHSA-864j-6qpp-cmrr.json
+++ b/advisories/github-reviewed/2020/06/GHSA-864j-6qpp-cmrr/GHSA-864j-6qpp-cmrr.json
@@ -48,6 +48,10 @@
       "type": "WEB",
       "url": "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7981"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/alexreisner/geocoder"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/alexreisner/geocoder/compare/v1.6.0...v1.6.1"
@@ -55,10 +59,6 @@
     {
       "type": "WEB",
       "url": "https://github.com/rubysec/ruby-advisory-db/blob/master/gems/geocoder/CVE-2020-7981.yml"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/alexreisner/geocoder"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-f3j5-rmmp-3fc5/GHSA-f3j5-rmmp-3fc5.json b/advisories/github-reviewed/2020/06/GHSA-f3j5-rmmp-3fc5/GHSA-f3j5-rmmp-3fc5.json
index 5095240e7c0..140da0b6eb9 100644
--- a/advisories/github-reviewed/2020/06/GHSA-f3j5-rmmp-3fc5/GHSA-f3j5-rmmp-3fc5.json
+++ b/advisories/github-reviewed/2020/06/GHSA-f3j5-rmmp-3fc5/GHSA-f3j5-rmmp-3fc5.json
@@ -68,6 +68,10 @@
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2020:0445"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/FasterXML/jackson-databind"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/FasterXML/jackson-databind/compare/jackson-databind-2.9.9.3...jackson-databind-2.9.10"
@@ -119,10 +123,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2020.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/FasterXML/jackson-databind"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-fpjm-rp2g-3r4c/GHSA-fpjm-rp2g-3r4c.json b/advisories/github-reviewed/2020/06/GHSA-fpjm-rp2g-3r4c/GHSA-fpjm-rp2g-3r4c.json
index 0bc745f2d63..e683a6ca181 100644
--- a/advisories/github-reviewed/2020/06/GHSA-fpjm-rp2g-3r4c/GHSA-fpjm-rp2g-3r4c.json
+++ b/advisories/github-reviewed/2020/06/GHSA-fpjm-rp2g-3r4c/GHSA-fpjm-rp2g-3r4c.json
@@ -57,13 +57,13 @@
       "type": "WEB",
       "url": "https://github.com/Styria-Digital/django-rest-framework-jwt/commit/868b5c22ddad59772b447080183e7c7101bb18e0"
     },
-    {
-      "type": "WEB",
-      "url": "https://pypi.org/project/drf-jwt/1.15.1/#history"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/Styria-Digital/django-rest-framework-jwt"
+    },
+    {
+      "type": "WEB",
+      "url": "https://pypi.org/project/drf-jwt/1.15.1/#history"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-g6wq-qcwm-j5g2/GHSA-g6wq-qcwm-j5g2.json b/advisories/github-reviewed/2020/06/GHSA-g6wq-qcwm-j5g2/GHSA-g6wq-qcwm-j5g2.json
index eb5583c07d5..d153f8a04ef 100644
--- a/advisories/github-reviewed/2020/06/GHSA-g6wq-qcwm-j5g2/GHSA-g6wq-qcwm-j5g2.json
+++ b/advisories/github-reviewed/2020/06/GHSA-g6wq-qcwm-j5g2/GHSA-g6wq-qcwm-j5g2.json
@@ -52,6 +52,10 @@
       "type": "WEB",
       "url": "https://blog.jcoglan.com/2020/06/02/redos-vulnerability-in-websocket-extensions"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/faye/websocket-extensions-ruby"
+    },
     {
       "type": "WEB",
       "url": "https://lists.debian.org/debian-lts-announce/2020/08/msg00031.html"
@@ -63,10 +67,6 @@
     {
       "type": "WEB",
       "url": "https://usn.ubuntu.com/4502-1/"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/faye/websocket-extensions-ruby"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-g78m-2chm-r7qv/GHSA-g78m-2chm-r7qv.json b/advisories/github-reviewed/2020/06/GHSA-g78m-2chm-r7qv/GHSA-g78m-2chm-r7qv.json
index 7633cde732a..400cc5d75fb 100644
--- a/advisories/github-reviewed/2020/06/GHSA-g78m-2chm-r7qv/GHSA-g78m-2chm-r7qv.json
+++ b/advisories/github-reviewed/2020/06/GHSA-g78m-2chm-r7qv/GHSA-g78m-2chm-r7qv.json
@@ -52,13 +52,13 @@
       "type": "WEB",
       "url": "https://blog.jcoglan.com/2020/06/02/redos-vulnerability-in-websocket-extensions"
     },
-    {
-      "type": "WEB",
-      "url": "https://snyk.io/vuln/SNYK-JS-WEBSOCKETEXTENSIONS-570623"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/faye/websocket-extensions-node"
+    },
+    {
+      "type": "WEB",
+      "url": "https://snyk.io/vuln/SNYK-JS-WEBSOCKETEXTENSIONS-570623"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-g86w-v5vg-9gxf/GHSA-g86w-v5vg-9gxf.json b/advisories/github-reviewed/2020/06/GHSA-g86w-v5vg-9gxf/GHSA-g86w-v5vg-9gxf.json
index 93537310ab5..77c82055dc3 100644
--- a/advisories/github-reviewed/2020/06/GHSA-g86w-v5vg-9gxf/GHSA-g86w-v5vg-9gxf.json
+++ b/advisories/github-reviewed/2020/06/GHSA-g86w-v5vg-9gxf/GHSA-g86w-v5vg-9gxf.json
@@ -59,13 +59,13 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2020-5405"
     },
-    {
-      "type": "WEB",
-      "url": "https://pivotal.io/security/cve-2020-5405"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/spring-cloud/spring-cloud-config/spring-cloud-config-server"
+    },
+    {
+      "type": "WEB",
+      "url": "https://pivotal.io/security/cve-2020-5405"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-r24h-634p-m72x/GHSA-r24h-634p-m72x.json b/advisories/github-reviewed/2020/06/GHSA-r24h-634p-m72x/GHSA-r24h-634p-m72x.json
index bbf286f7a8c..b2db9d8871a 100644
--- a/advisories/github-reviewed/2020/06/GHSA-r24h-634p-m72x/GHSA-r24h-634p-m72x.json
+++ b/advisories/github-reviewed/2020/06/GHSA-r24h-634p-m72x/GHSA-r24h-634p-m72x.json
@@ -44,13 +44,13 @@
       "type": "WEB",
       "url": "https://github.com/Atinux/schema-inspector/commit/345a7b2eed11bb6128421150d65f4f83fdbb737d"
     },
-    {
-      "type": "WEB",
-      "url": "https://snyk.io/vuln/SNYK-JS-SCHEMAINSPECTOR-536970"
-    },
     {
       "type": "PACKAGE",
       "url": "https://github.com/Atinux/schema-inspector"
+    },
+    {
+      "type": "WEB",
+      "url": "https://snyk.io/vuln/SNYK-JS-SCHEMAINSPECTOR-536970"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-wpjr-j57x-wxfw/GHSA-wpjr-j57x-wxfw.json b/advisories/github-reviewed/2020/06/GHSA-wpjr-j57x-wxfw/GHSA-wpjr-j57x-wxfw.json
index e891d946499..385155f1c13 100644
--- a/advisories/github-reviewed/2020/06/GHSA-wpjr-j57x-wxfw/GHSA-wpjr-j57x-wxfw.json
+++ b/advisories/github-reviewed/2020/06/GHSA-wpjr-j57x-wxfw/GHSA-wpjr-j57x-wxfw.json
@@ -63,6 +63,10 @@
       "type": "WEB",
       "url": "https://docs.djangoproject.com/en/3.0/releases/security/"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/django/django"
+    },
     {
       "type": "WEB",
       "url": "https://groups.google.com/d/msg/django-announce/pPEmb2ot4Fo/X-SMalYSBAAJ"
@@ -98,10 +102,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpujan2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/django/django"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-x64g-4xx9-fh6x/GHSA-x64g-4xx9-fh6x.json b/advisories/github-reviewed/2020/06/GHSA-x64g-4xx9-fh6x/GHSA-x64g-4xx9-fh6x.json
index bf5987b7069..4972ed08b10 100644
--- a/advisories/github-reviewed/2020/06/GHSA-x64g-4xx9-fh6x/GHSA-x64g-4xx9-fh6x.json
+++ b/advisories/github-reviewed/2020/06/GHSA-x64g-4xx9-fh6x/GHSA-x64g-4xx9-fh6x.json
@@ -91,6 +91,10 @@
       "type": "WEB",
       "url": "https://github.com/vt-middleware/cryptacular/commit/ec2fb65f2455c479376695e3d75d30c7f6884b3f"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/vt-middleware/cryptacular"
+    },
     {
       "type": "WEB",
       "url": "https://github.com/vt-middleware/cryptacular/blob/fafccd07ab1214e3588a35afe3c361519129605f/src/main/java/org/cryptacular/CiphertextHeader.java#L153"
@@ -146,10 +150,6 @@
     {
       "type": "WEB",
       "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/vt-middleware/cryptacular"
     }
   ],
   "database_specific": {
diff --git a/advisories/github-reviewed/2020/06/GHSA-x7m2-6g99-84w5/GHSA-x7m2-6g99-84w5.json b/advisories/github-reviewed/2020/06/GHSA-x7m2-6g99-84w5/GHSA-x7m2-6g99-84w5.json
index a7605873d37..9d79b360344 100644
--- a/advisories/github-reviewed/2020/06/GHSA-x7m2-6g99-84w5/GHSA-x7m2-6g99-84w5.json
+++ b/advisories/github-reviewed/2020/06/GHSA-x7m2-6g99-84w5/GHSA-x7m2-6g99-84w5.json
@@ -40,6 +40,10 @@
       "type": "ADVISORY",
       "url": "https://nvd.nist.gov/vuln/detail/CVE-2020-7652"
     },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/snyk/broker"
+    },
     {
       "type": "WEB",
       "url": "https://snyk.io/vuln/SNYK-JS-SNYKBROKER-570611"
@@ -47,10 +51,6 @@
     {
       "type": "WEB",
       "url": "https://updates.snyk.io/snyk-broker-security-fixes-152338"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/snyk/broker"
     }
   ],
   "database_specific": {