diff --git a/data/cisagov_E.yml b/data/cisagov_E.yml
index 8d1d237..c8657ee 100644
--- a/data/cisagov_E.yml
+++ b/data/cisagov_E.yml
@@ -183,8 +183,8 @@ software:
     references:
       - ''
     last_updated: '2022-01-12T07:18:50+00:00'
-  - vendor: EGroupware
-    product: All
+  - vendor: eG Innovations
+    product: eG Enterprise
     cves:
       cve-2021-4104:
         investigated: false
@@ -192,10 +192,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - '7.1.8 - 7.1.9'
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -207,13 +208,13 @@ software:
         fixed_versions: []
         unaffected_versions: []
     vendor_links:
-      - https://help.egroupware.org/t/uk-de-statement-log4j-log4shell/76430
+      - https://www.eginnovations.com/brochures/eGEnterprise-and-Log4jShell-Vulnerability.pdf
     notes: ''
     references:
       - ''
-    last_updated: '2022-01-12T07:18:50+00:00'
-  - vendor: Elastic
-    product: APM Java Agent
+    last_updated: '2022-01-06T00:00:00'
+  - vendor: EGroupware
+    product: All
     cves:
       cve-2021-4104:
         investigated: false
@@ -236,13 +237,13 @@ software:
         fixed_versions: []
         unaffected_versions: []
     vendor_links:
-      - https://discuss.elastic.co/t/apache-log4j2-remote-code-execution-rce-vulnerability-cve-2021-44228-esa-2021-31/291476
+      - https://help.egroupware.org/t/uk-de-statement-log4j-log4shell/76430
     notes: ''
     references:
       - ''
-    last_updated: '2021-12-15T00:00:00'
+    last_updated: '2022-01-12T07:18:50+00:00'
   - vendor: Elastic
-    product: APM Server
+    product: APM Java Agent
     cves:
       cve-2021-4104:
         investigated: false
@@ -250,9 +251,10 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
-        fixed_versions: []
+        fixed_versions:
+          - '1.17.0 - 1.28.0'
         unaffected_versions: []
       cve-2021-45046:
         investigated: false
@@ -266,12 +268,12 @@ software:
         unaffected_versions: []
     vendor_links:
       - https://discuss.elastic.co/t/apache-log4j2-remote-code-execution-rce-vulnerability-cve-2021-44228-esa-2021-31/291476
-    notes: ''
+    notes: Only vulnerable with specific configuration.
     references:
       - ''
     last_updated: '2021-12-15T00:00:00'
   - vendor: Elastic
-    product: Beats
+    product: APM Server
     cves:
       cve-2021-4104:
         investigated: false
@@ -279,10 +281,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -300,7 +303,7 @@ software:
       - ''
     last_updated: '2021-12-15T00:00:00'
   - vendor: Elastic
-    product: Cmd
+    product: Beats
     cves:
       cve-2021-4104:
         investigated: false
@@ -308,10 +311,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -329,7 +333,7 @@ software:
       - ''
     last_updated: '2021-12-15T00:00:00'
   - vendor: Elastic
-    product: Elastic Agent
+    product: Cmd
     cves:
       cve-2021-4104:
         investigated: false
@@ -337,10 +341,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -358,7 +363,7 @@ software:
       - ''
     last_updated: '2021-12-15T00:00:00'
   - vendor: Elastic
-    product: Elastic Cloud
+    product: Elastic Agent
     cves:
       cve-2021-4104:
         investigated: false
@@ -366,10 +371,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -387,7 +393,7 @@ software:
       - ''
     last_updated: '2021-12-15T00:00:00'
   - vendor: Elastic
-    product: Elastic Cloud Enterprise
+    product: Elastic Cloud
     cves:
       cve-2021-4104:
         investigated: false
@@ -395,10 +401,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -424,10 +431,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -453,10 +461,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -482,10 +491,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -511,10 +521,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -541,11 +552,9 @@ software:
         unaffected_versions: []
       cve-2021-44228:
         investigated: true
-        affected_versions:
-          - '5'
-          - '6'
-          - '8'
-        fixed_versions: []
+        affected_versions: []
+        fixed_versions:
+          - '7.16.2'
         unaffected_versions: []
       cve-2021-45046:
         investigated: false
@@ -572,10 +581,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -601,10 +611,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -630,10 +641,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -659,10 +671,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -689,10 +702,9 @@ software:
         unaffected_versions: []
       cve-2021-44228:
         investigated: true
-        affected_versions:
-          - <6.8.21
-          - <7.16.1
-        fixed_versions: []
+        affected_versions: []
+        fixed_versions:
+          - '6.8.22'
         unaffected_versions: []
       cve-2021-45046:
         investigated: false
@@ -719,10 +731,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -748,10 +761,11 @@ software:
         fixed_versions: []
         unaffected_versions: []
       cve-2021-44228:
-        investigated: false
+        investigated: true
         affected_versions: []
         fixed_versions: []
-        unaffected_versions: []
+        unaffected_versions:
+          - ''
       cve-2021-45046:
         investigated: false
         affected_versions: []
@@ -768,34 +782,6 @@ software:
     references:
       - ''
     last_updated: '2021-12-15T00:00:00'
-  - vendor: ElasticSearch
-    product: all products
-    cves:
-      cve-2021-4104:
-        investigated: false
-        affected_versions: []
-        fixed_versions: []
-        unaffected_versions: []
-      cve-2021-44228:
-        investigated: false
-        affected_versions: []
-        fixed_versions: []
-        unaffected_versions: []
-      cve-2021-45046:
-        investigated: false
-        affected_versions: []
-        fixed_versions: []
-        unaffected_versions: []
-      cve-2021-45105:
-        investigated: false
-        affected_versions: []
-        fixed_versions: []
-        unaffected_versions: []
-    vendor_links: []
-    notes: ''
-    references:
-      - ''
-    last_updated: '2022-01-12T07:18:50+00:00'
   - vendor: Ellucian
     product: Admin
     cves: