diff --git a/advisories/github-reviewed/2022/05/GHSA-m7xj-ccqc-p4g2/GHSA-m7xj-ccqc-p4g2.json b/advisories/github-reviewed/2022/05/GHSA-m7xj-ccqc-p4g2/GHSA-m7xj-ccqc-p4g2.json
index f2012bf45da..a9fe8fb63ae 100644
--- a/advisories/github-reviewed/2022/05/GHSA-m7xj-ccqc-p4g2/GHSA-m7xj-ccqc-p4g2.json
+++ b/advisories/github-reviewed/2022/05/GHSA-m7xj-ccqc-p4g2/GHSA-m7xj-ccqc-p4g2.json
@@ -88,74 +88,6 @@
       "type": "WEB",
       "url": "https://github.com/apache/tomcat/commit/c55ad56ed72ee1dbfe790bc5492d4df74e3e754f"
     },
-    {
-      "type": "WEB",
-      "url": "https://exchange.xforce.ibmcloud.com/vulnerabilities/44411"
-    },
-    {
-      "type": "PACKAGE",
-      "url": "https://github.com/apache/tomcat"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/29dc6c2b625789e70a9c4756b5a327e6547273ff8bde7e0327af48c5%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/29dc6c2b625789e70a9c4756b5a327e6547273ff8bde7e0327af48c5@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/c62b0e3a7bf23342352a5810c640a94b6db69957c5c19db507004d74%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/c62b0e3a7bf23342352a5810c640a94b6db69957c5c19db507004d74@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/rb71997f506c6cc8b530dd845c084995a9878098846c7b4eacfae8db3%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/rb71997f506c6cc8b530dd845c084995a9878098846c7b4eacfae8db3@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apple.com/archives/security-announce/2008/Oct/msg00001.html"
-    },
-    {
-      "type": "WEB",
-      "url": "https://oval.cisecurity.org/repository/search/definition/oval%3Aorg.mitre.oval%3Adef%3A10587"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20080827130946/http://securityreason.com/securityalert/4148"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20090201124623/http://secunia.com/advisories/31639"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20090201124633/http://secunia.com/advisories/31891"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20090201124638/http://secunia.com/advisories/32120"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20090201124957/http://secunia.com/advisories/31982"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20090201125002/http://secunia.com/advisories/32266"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20090201141000/http://secunia.com/advisories/32222"
-    },
     {
       "type": "WEB",
       "url": "https://web.archive.org/web/20090207111236/http://secunia.com/advisories/33797"
@@ -224,6 +156,74 @@
       "type": "WEB",
       "url": "https://www.redhat.com/archives/fedora-package-announce/2008-September/msg00889.html"
     },
+    {
+      "type": "WEB",
+      "url": "https://exchange.xforce.ibmcloud.com/vulnerabilities/44411"
+    },
+    {
+      "type": "PACKAGE",
+      "url": "https://github.com/apache/tomcat"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/29dc6c2b625789e70a9c4756b5a327e6547273ff8bde7e0327af48c5%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/29dc6c2b625789e70a9c4756b5a327e6547273ff8bde7e0327af48c5@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/c62b0e3a7bf23342352a5810c640a94b6db69957c5c19db507004d74%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/c62b0e3a7bf23342352a5810c640a94b6db69957c5c19db507004d74@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/rb71997f506c6cc8b530dd845c084995a9878098846c7b4eacfae8db3%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/rb71997f506c6cc8b530dd845c084995a9878098846c7b4eacfae8db3@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apple.com/archives/security-announce/2008/Oct/msg00001.html"
+    },
+    {
+      "type": "WEB",
+      "url": "https://oval.cisecurity.org/repository/search/definition/oval%3Aorg.mitre.oval%3Adef%3A10587"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20080827130946/http://securityreason.com/securityalert/4148"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20090201124623/http://secunia.com/advisories/31639"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20090201124633/http://secunia.com/advisories/31891"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20090201124638/http://secunia.com/advisories/32120"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20090201124957/http://secunia.com/advisories/31982"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20090201125002/http://secunia.com/advisories/32266"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20090201141000/http://secunia.com/advisories/32222"
+    },
     {
       "type": "WEB",
       "url": "http://lists.opensuse.org/opensuse-security-announce/2008-09/msg00004.html"
diff --git a/advisories/github-reviewed/2022/05/GHSA-q6x7-f33r-3wxx/GHSA-q6x7-f33r-3wxx.json b/advisories/github-reviewed/2022/05/GHSA-q6x7-f33r-3wxx/GHSA-q6x7-f33r-3wxx.json
index 39273927738..4ed0a3b88f6 100644
--- a/advisories/github-reviewed/2022/05/GHSA-q6x7-f33r-3wxx/GHSA-q6x7-f33r-3wxx.json
+++ b/advisories/github-reviewed/2022/05/GHSA-q6x7-f33r-3wxx/GHSA-q6x7-f33r-3wxx.json
@@ -122,6 +122,82 @@
       "type": "WEB",
       "url": "https://github.com/apache/tomcat80/commit/824c7dc781056442046db0ae34bcf1497f23f44c"
     },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/9325837eb00cba5752c092047433c7f0415134d16e7f391447ff4352%40%3Cannounce.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/9325837eb00cba5752c092047433c7f0415134d16e7f391447ff4352@%3Cannounce.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/b5e3f51d28cd5d9b1809f56594f2cf63dcd6a90429e16ea9f83bbedc%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/b5e3f51d28cd5d9b1809f56594f2cf63dcd6a90429e16ea9f83bbedc@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/b84ad1258a89de5c9c853c7f2d3ad77e5b8b2930be9e132d5cef6b95%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/b84ad1258a89de5c9c853c7f2d3ad77e5b8b2930be9e132d5cef6b95@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/b8a1bf18155b552dcf9a928ba808cbadad84c236d85eab3033662cfb%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/b8a1bf18155b552dcf9a928ba808cbadad84c236d85eab3033662cfb@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/r03c597a64de790ba42c167efacfa23300c3d6c9fe589ab87fe02859c%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/r03c597a64de790ba42c167efacfa23300c3d6c9fe589ab87fe02859c@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/r587e50b86c1a96ee301f751d50294072d142fd6dc08a8987ae9f3a9b%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/r587e50b86c1a96ee301f751d50294072d142fd6dc08a8987ae9f3a9b@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/r9136ff5b13e4f1941360b5a309efee2c114a14855578c3a2cbe5d19c%40%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://lists.apache.org/thread.html/r9136ff5b13e4f1941360b5a309efee2c114a14855578c3a2cbe5d19c@%3Cdev.tomcat.apache.org%3E"
+    },
+    {
+      "type": "WEB",
+      "url": "https://security.netapp.com/advisory/ntap-20180605-0001"
+    },
+    {
+      "type": "WEB",
+      "url": "https://usn.ubuntu.com/4557-1"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20170320064509/http://www.securitytracker.com/id/1037145"
+    },
+    {
+      "type": "WEB",
+      "url": "https://web.archive.org/web/20170423095945/http://www.securityfocus.com/bid/93940"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
+    },
     {
       "type": "WEB",
       "url": "https://access.redhat.com/errata/RHSA-2017:0455"
@@ -202,82 +278,6 @@
       "type": "WEB",
       "url": "https://lists.apache.org/thread.html/88855876c33f2f9c532ffb75bfee570ccf0b17ffa77493745af9a17a@%3Cdev.tomcat.apache.org%3E"
     },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/9325837eb00cba5752c092047433c7f0415134d16e7f391447ff4352%40%3Cannounce.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/9325837eb00cba5752c092047433c7f0415134d16e7f391447ff4352@%3Cannounce.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/b5e3f51d28cd5d9b1809f56594f2cf63dcd6a90429e16ea9f83bbedc%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/b5e3f51d28cd5d9b1809f56594f2cf63dcd6a90429e16ea9f83bbedc@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/b84ad1258a89de5c9c853c7f2d3ad77e5b8b2930be9e132d5cef6b95%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/b84ad1258a89de5c9c853c7f2d3ad77e5b8b2930be9e132d5cef6b95@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/b8a1bf18155b552dcf9a928ba808cbadad84c236d85eab3033662cfb%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/b8a1bf18155b552dcf9a928ba808cbadad84c236d85eab3033662cfb@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/r03c597a64de790ba42c167efacfa23300c3d6c9fe589ab87fe02859c%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/r03c597a64de790ba42c167efacfa23300c3d6c9fe589ab87fe02859c@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/r587e50b86c1a96ee301f751d50294072d142fd6dc08a8987ae9f3a9b%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/r587e50b86c1a96ee301f751d50294072d142fd6dc08a8987ae9f3a9b@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/r9136ff5b13e4f1941360b5a309efee2c114a14855578c3a2cbe5d19c%40%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://lists.apache.org/thread.html/r9136ff5b13e4f1941360b5a309efee2c114a14855578c3a2cbe5d19c@%3Cdev.tomcat.apache.org%3E"
-    },
-    {
-      "type": "WEB",
-      "url": "https://security.netapp.com/advisory/ntap-20180605-0001"
-    },
-    {
-      "type": "WEB",
-      "url": "https://usn.ubuntu.com/4557-1"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20170320064509/http://www.securitytracker.com/id/1037145"
-    },
-    {
-      "type": "WEB",
-      "url": "https://web.archive.org/web/20170423095945/http://www.securityfocus.com/bid/93940"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
-    },
     {
       "type": "WEB",
       "url": "http://rhn.redhat.com/errata/RHSA-2017-0457.html"
diff --git a/advisories/unreviewed/2022/05/GHSA-cxqv-r2cc-r9c9/GHSA-cxqv-r2cc-r9c9.json b/advisories/unreviewed/2022/05/GHSA-cxqv-r2cc-r9c9/GHSA-cxqv-r2cc-r9c9.json
index 0ab5d446c4e..5523cbb4842 100644
--- a/advisories/unreviewed/2022/05/GHSA-cxqv-r2cc-r9c9/GHSA-cxqv-r2cc-r9c9.json
+++ b/advisories/unreviewed/2022/05/GHSA-cxqv-r2cc-r9c9/GHSA-cxqv-r2cc-r9c9.json
@@ -31,51 +31,7 @@
     },
     {
       "type": "WEB",
-      "url": "https://bugs.python.org/issue36384"
-    },
-    {
-      "type": "WEB",
-      "url": "https://docs.python.org/3/library/ipaddress.html"
-    },
-    {
-      "type": "WEB",
-      "url": "https://github.com/python/cpython/blob/63298930fb531ba2bb4f23bc3b915dbf1e17e9e1/Misc/NEWS.d/3.8.0a4.rst"
-    },
-    {
-      "type": "WEB",
-      "url": "https://github.com/sickcodes"
-    },
-    {
-      "type": "WEB",
-      "url": "https://github.com/sickcodes/security/blob/master/advisories/SICK-2021-014.md"
-    },
-    {
-      "type": "WEB",
-      "url": "https://python-security.readthedocs.io/vuln/ipaddress-ipv4-leading-zeros.html"
-    },
-    {
-      "type": "WEB",
-      "url": "https://security.gentoo.org/glsa/202305-02"
-    },
-    {
-      "type": "WEB",
-      "url": "https://security.netapp.com/advisory/ntap-20210622-0003"
-    },
-    {
-      "type": "WEB",
-      "url": "https://sick.codes/sick-2021-014"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.oracle.com//security-alerts/cpujul2021.html"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.oracle.com/security-alerts/cpuapr2022.html"
-    },
-    {
-      "type": "WEB",
-      "url": "https://www.oracle.com/security-alerts/cpujan2022.html"
+      "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
     },
     {
       "type": "WEB",
@@ -83,7 +39,51 @@
     },
     {
       "type": "WEB",
-      "url": "https://www.oracle.com/security-alerts/cpuoct2021.html"
+      "url": "https://www.oracle.com/security-alerts/cpujan2022.html"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.oracle.com/security-alerts/cpuapr2022.html"
+    },
+    {
+      "type": "WEB",
+      "url": "https://www.oracle.com//security-alerts/cpujul2021.html"
+    },
+    {
+      "type": "WEB",
+      "url": "https://sick.codes/sick-2021-014"
+    },
+    {
+      "type": "WEB",
+      "url": "https://security.netapp.com/advisory/ntap-20210622-0003"
+    },
+    {
+      "type": "WEB",
+      "url": "https://security.gentoo.org/glsa/202305-02"
+    },
+    {
+      "type": "WEB",
+      "url": "https://python-security.readthedocs.io/vuln/ipaddress-ipv4-leading-zeros.html"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/sickcodes/security/blob/master/advisories/SICK-2021-014.md"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/sickcodes"
+    },
+    {
+      "type": "WEB",
+      "url": "https://github.com/python/cpython/blob/63298930fb531ba2bb4f23bc3b915dbf1e17e9e1/Misc/NEWS.d/3.8.0a4.rst"
+    },
+    {
+      "type": "WEB",
+      "url": "https://docs.python.org/3/library/ipaddress.html"
+    },
+    {
+      "type": "WEB",
+      "url": "https://bugs.python.org/issue36384"
     }
   ],
   "database_specific": {