diff --git a/cves/2007/CVE-2007-5728.yaml b/cves/2007/CVE-2007-5728.yaml
index 5869c1a1f00..98c2548f6fb 100644
--- a/cves/2007/CVE-2007-5728.yaml
+++ b/cves/2007/CVE-2007-5728.yaml
@@ -4,11 +4,11 @@ info:
   name: phpPgAdmin 4.1.1 - 'Redirect.php' Cross-Site Scripting
   author: dhiyaneshDK
   severity: medium
-  tags: cve2007,xss,phppgadmin
+  description: Cross-site scripting (XSS) vulnerability in phpPgAdmin 3.5 to 4.1.1, and possibly 4.1.2, allows remote attackers to inject arbitrary web script or HTML via certain input available in PHP_SELF in (1) redirect.php, possibly related to (2) login.php, different vectors than CVE-2007-2865.
+  tags: cve,cve2007,xss,pgadmin
   reference: https://www.exploit-db.com/exploits/30090
   metadata:
     shodan-query: 'http.title:"phpPgAdmin"'
-  description: "Cross-site scripting (XSS) vulnerability in phpPgAdmin 3.5 to 4.1.1, and possibly 4.1.2, allows remote attackers to inject arbitrary web script or HTML via certain input available in PHP_SELF in (1) redirect.php, possibly related to (2) login.php, different vectors than CVE-2007-2865."
 
 requests:
   - method: GET
@@ -17,13 +17,16 @@ requests:
 
     matchers-condition: and
     matchers:
+
       - type: word
         words:
           - '<script>alert("document.domain")</script>'
+
       - type: status
         status:
           - 200
+
       - type: word
+        part: header
         words:
           - "text/html"
-        part: header
diff --git a/cves/2014/CVE-2014-8682.yaml b/cves/2014/CVE-2014-8682.yaml
index 282d8b7b1a8..1d35e669fd4 100644
--- a/cves/2014/CVE-2014-8682.yaml
+++ b/cves/2014/CVE-2014-8682.yaml
@@ -4,10 +4,7 @@ info:
   name: Gogs - 'users'/'repos' '?q' SQL Injection
   author: dhiyaneshDK
   severity: high
-  tags: cve2014,sqli,gogs
-  metadata:
-    shodan-query: 'title:"Sign In - Gogs"'
-  description: "Multiple SQL injection vulnerabilities in Gogs (aka Go Git Service) 0.3.1-9 through 0.5.x before 0.5.6.1105 Beta allow remote attackers to execute arbitrary SQL commands via the q parameter to (1) api/v1/repos/search, which is not properly handled in models/repo.go, or (2) api/v1/users/search, which is not properly handled in models/user.go."
+  description: Multiple SQL injection vulnerabilities in Gogs (aka Go Git Service) 0.3.1-9 through 0.5.x before 0.5.6.1105 Beta allow remote attackers to execute arbitrary SQL commands via the q parameter to (1) api/v1/repos/search, which is not properly handled in models/repo.go, or (2) api/v1/users/search, which is not properly handled in models/user.go.
   reference:
     - http://www.securityfocus.com/bid/71187
     - http://seclists.org/fulldisclosure/2014/Nov/33
@@ -17,6 +14,9 @@ info:
     - http://www.exploit-db.com/exploits/35238
     - https://exchange.xforce.ibmcloud.com/vulnerabilities/98694
     - http://www.securityfocus.com/archive/1/533995/100/0/threaded
+  tags: cve,cve2014,sqli,gogs
+  metadata:
+    shodan-query: 'title:"Sign In - Gogs"'
 
 requests:
   - method: GET
@@ -29,6 +29,7 @@ requests:
         words:
           - '"ok":true'
           - '"data"'
+
       - type: status
         status:
           - 200
diff --git a/exposed-panels/gitea-login.yaml b/exposed-panels/gitea-login.yaml
index a5eeb886a13..c73a34982a0 100644
--- a/exposed-panels/gitea-login.yaml
+++ b/exposed-panels/gitea-login.yaml
@@ -4,7 +4,7 @@ info:
   name: Gitea Login
   author: dhiyaneshDK
   severity: info
-  tags: gitea
+  tags: gitea,panel
   metadata:
     shodan-query: 'html:"Powered by Gitea Version"'
 
@@ -15,9 +15,11 @@ requests:
 
     matchers-condition: and
     matchers:
+
       - type: word
         words:
           - 'Powered by Gitea Version'
+
       - type: status
         status:
           - 200
diff --git a/exposed-panels/gogs-login.yaml b/exposed-panels/gogs-login.yaml
index 5d50bb0ab04..c9087e8c40e 100644
--- a/exposed-panels/gogs-login.yaml
+++ b/exposed-panels/gogs-login.yaml
@@ -4,7 +4,7 @@ info:
   name: Sign In - Gogs
   author: dhiyaneshDK
   severity: info
-  tags: panel
+  tags: panel,gogs
   metadata:
     shodan-query: 'title:"Sign In - Gogs"'
 
@@ -15,9 +15,11 @@ requests:
 
     matchers-condition: and
     matchers:
+
       - type: word
         words:
           - '<title>Sign In - Gogs</title>'
+
       - type: status
         status:
           - 200
diff --git a/exposed-panels/phabricator-login.yaml b/exposed-panels/phabricator-login.yaml
index a870c3b3bec..b2f364e31ff 100644
--- a/exposed-panels/phabricator-login.yaml
+++ b/exposed-panels/phabricator-login.yaml
@@ -4,7 +4,7 @@ info:
   name: Phabricator Login
   author: dhiyaneshDK
   severity: info
-  tags: panel
+  tags: panel,phabricator
   metadata:
     shodan-query: 'html:"phabricator-standard-page"'
 
@@ -15,9 +15,11 @@ requests:
 
     matchers-condition: and
     matchers:
+
       - type: word
         words:
           - 'phabricator-standard-page'
+
       - type: status
         status:
           - 200
diff --git a/misconfiguration/git-web-interface.yaml b/misconfiguration/git-web-interface.yaml
index d454a1796de..c8e8b1510a1 100644
--- a/misconfiguration/git-web-interface.yaml
+++ b/misconfiguration/git-web-interface.yaml
@@ -18,6 +18,7 @@ requests:
       - type: word
         words:
           - 'git web interface version'
+
       - type: status
         status:
-          - 200
+          - 200
\ No newline at end of file
diff --git a/misconfiguration/gitlist-disclosure.yaml b/misconfiguration/gitlist-disclosure.yaml
index 91a15e7a1be..a0cb05fd246 100644
--- a/misconfiguration/gitlist-disclosure.yaml
+++ b/misconfiguration/gitlist-disclosure.yaml
@@ -18,6 +18,7 @@ requests:
       - type: word
         words:
           - 'GitList</title>'
+
       - type: status
         status:
-          - 200
+          - 200
\ No newline at end of file