diff --git a/dast/vulnerabilities/sqli/time-based-sqli.yaml b/dast/vulnerabilities/sqli/time-based-sqli.yaml
index e659b7f2d9..77b16407b8 100644
--- a/dast/vulnerabilities/sqli/time-based-sqli.yaml
+++ b/dast/vulnerabilities/sqli/time-based-sqli.yaml
@@ -6,7 +6,7 @@ info:
   severity: critical
   description: |
     This Template detects time-based Blind SQL Injection vulnerability
-  tags: time-based,sqli,dast,time-based,blind
+  tags: time-based-sqli,sqli,dast,time-based-sqli,blind
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2015/CVE-2015-2196.yaml b/http/cves/2015/CVE-2015-2196.yaml
index 20bae87ce5..ed7c850053 100644
--- a/http/cves/2015/CVE-2015-2196.yaml
+++ b/http/cves/2015/CVE-2015-2196.yaml
@@ -28,7 +28,7 @@ info:
     vendor: web-dorado
     product: spider_calendar
     framework: wordpress
-  tags: time-based,cve2015,cve,wordpress,wp,sqli,wpscan,wp-plugin,spider-event-calendar,unauth,edb,web-dorado
+  tags: time-based-sqli,cve2015,cve,wordpress,wp,sqli,wpscan,wp-plugin,spider-event-calendar,unauth,edb,web-dorado
 
 http:
   - raw:
diff --git a/http/cves/2015/CVE-2015-4062.yaml b/http/cves/2015/CVE-2015-4062.yaml
index 2ff30e4f32..9d794d0b98 100644
--- a/http/cves/2015/CVE-2015-4062.yaml
+++ b/http/cves/2015/CVE-2015-4062.yaml
@@ -30,7 +30,7 @@ info:
     vendor: newstatpress_project
     product: newstatpress
     framework: wordpress
-  tags: time-based,cve2015,cve,authenticated,sqli,wp-plugin,newstatpress,packetstorm,wordpress,wp,newstatpress_project
+  tags: time-based-sqli,cve2015,cve,authenticated,sqli,wp-plugin,newstatpress,packetstorm,wordpress,wp,newstatpress_project
 
 http:
   - raw:
diff --git a/http/cves/2015/CVE-2015-9323.yaml b/http/cves/2015/CVE-2015-9323.yaml
index 17c3be3d27..6270ea9bf4 100644
--- a/http/cves/2015/CVE-2015-9323.yaml
+++ b/http/cves/2015/CVE-2015-9323.yaml
@@ -29,7 +29,7 @@ info:
     vendor: duckdev
     product: 404_to_301
     framework: wordpress
-  tags: time-based,cve2015,cve,404-to-301,sqli,wpscan,wp-plugin,wp,wordpress,authenticated,duckdev
+  tags: time-based-sqli,cve2015,cve,404-to-301,sqli,wpscan,wp-plugin,wp,wordpress,authenticated,duckdev
 
 http:
   - raw:
diff --git a/http/cves/2018/CVE-2018-16159.yaml b/http/cves/2018/CVE-2018-16159.yaml
index e45a3367df..91c8fc1502 100644
--- a/http/cves/2018/CVE-2018-16159.yaml
+++ b/http/cves/2018/CVE-2018-16159.yaml
@@ -31,7 +31,7 @@ info:
     framework: wordpress
     shodan-query: http.html:"/wp-content/plugins/gift-voucher/"
     fofa-query: body="/wp-content/plugins/gift-voucher/"
-  tags: time-based,cve,cve2018,sqli,wordpress,unauth,wp,gift-voucher,edb,wpscan,wp-plugin,codemenschen
+  tags: time-based-sqli,cve,cve2018,sqli,wordpress,unauth,wp,gift-voucher,edb,wpscan,wp-plugin,codemenschen
 
 http:
   - raw:
diff --git a/http/cves/2018/CVE-2018-7282.yaml b/http/cves/2018/CVE-2018-7282.yaml
index 7a0be7e458..575f49f6fc 100644
--- a/http/cves/2018/CVE-2018-7282.yaml
+++ b/http/cves/2018/CVE-2018-7282.yaml
@@ -31,7 +31,7 @@ info:
     fofa-query: title="printmonitor"
     google-query: intitle:"printmonitor"
     product": printmonitor
-  tags: time-based,cve2018,cve,sqli,printmonitor,unauth,titool
+  tags: time-based-sqli,cve2018,cve,sqli,printmonitor,unauth,titool
 variables:
   username: "{{rand_base(6)}}"
   password: "{{rand_base(8)}}"
diff --git a/http/cves/2019/CVE-2019-7139.yaml b/http/cves/2019/CVE-2019-7139.yaml
index 83ee6bc127..8bef5ba5c9 100644
--- a/http/cves/2019/CVE-2019-7139.yaml
+++ b/http/cves/2019/CVE-2019-7139.yaml
@@ -32,7 +32,7 @@ info:
       - http.component:"Magento"
       - cpe:"cpe:2.3:a:magento:magento"
       - http.component:"magento"
-  tags: time-based,cve,cve2019,sqli,magento
+  tags: time-based-sqli,cve,cve2019,sqli,magento
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2020/CVE-2020-11530.yaml b/http/cves/2020/CVE-2020-11530.yaml
index 49e61d4230..0bfa32caff 100644
--- a/http/cves/2020/CVE-2020-11530.yaml
+++ b/http/cves/2020/CVE-2020-11530.yaml
@@ -30,7 +30,7 @@ info:
     vendor: idangero
     product: chop_slider
     framework: wordpress
-  tags: time-based,cve,cve2020,wpscan,seclists,sqli,wordpress,wp-plugin,wp,chopslider,unauth,idangero
+  tags: time-based-sqli,cve,cve2020,wpscan,seclists,sqli,wordpress,wp-plugin,wp,chopslider,unauth,idangero
 
 http:
   - raw:
diff --git a/http/cves/2020/CVE-2020-17463.yaml b/http/cves/2020/CVE-2020-17463.yaml
index 84344bbe03..8a1ac8b7f0 100644
--- a/http/cves/2020/CVE-2020-17463.yaml
+++ b/http/cves/2020/CVE-2020-17463.yaml
@@ -31,7 +31,7 @@ info:
     shodan-query: http.title:"fuel cms"
     fofa-query: title="fuel cms"
     google-query: intitle:"fuel cms"
-  tags: time-based,cve,cve2020,packetstorm,sqli,fuel-cms,kev,thedaylightstudio
+  tags: time-based-sqli,cve,cve2020,packetstorm,sqli,fuel-cms,kev,thedaylightstudio
 
 http:
   - raw:
diff --git a/http/cves/2020/CVE-2020-26248.yaml b/http/cves/2020/CVE-2020-26248.yaml
index 3d08387878..7400462488 100644
--- a/http/cves/2020/CVE-2020-26248.yaml
+++ b/http/cves/2020/CVE-2020-26248.yaml
@@ -29,7 +29,7 @@ info:
     vendor: prestashop
     product: productcomments
     framework: prestashop
-  tags: time-based,cve,cve2020,packetstorm,sqli,prestshop,prestashop
+  tags: time-based-sqli,cve,cve2020,packetstorm,sqli,prestshop,prestashop
 
 http:
   - raw:
diff --git a/http/cves/2020/CVE-2020-27481.yaml b/http/cves/2020/CVE-2020-27481.yaml
index 43c0ae2c7f..9552ef2aa3 100644
--- a/http/cves/2020/CVE-2020-27481.yaml
+++ b/http/cves/2020/CVE-2020-27481.yaml
@@ -27,7 +27,7 @@ info:
     vendor: goodlayers
     product: good_learning_management_system
     framework: wordpress
-  tags: time-based,cve,cve2020,goodlayerslms,sqli,wpscan,goodlayers,wordpress
+  tags: time-based-sqli,cve,cve2020,goodlayerslms,sqli,wpscan,goodlayers,wordpress
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24340.yaml b/http/cves/2021/CVE-2021-24340.yaml
index f1df9c40a3..089c11ab29 100644
--- a/http/cves/2021/CVE-2021-24340.yaml
+++ b/http/cves/2021/CVE-2021-24340.yaml
@@ -30,7 +30,7 @@ info:
     fofa-query: body=/wp-content/plugins/wp-statistics/
     publicwww-query: /wp-content/plugins/wp-statistics/
     google-query: inurl:/wp-content/plugins/wp-statistics
-  tags: time-based,cve2021,cve,wp-plugin,unauth,wpscan,wordpress,sqli,blind,edb,veronalabs
+  tags: time-based-sqli,cve2021,cve,wp-plugin,unauth,wpscan,wordpress,sqli,blind,edb,veronalabs
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24442.yaml b/http/cves/2021/CVE-2021-24442.yaml
index ab9b394ac2..841b736b80 100644
--- a/http/cves/2021/CVE-2021-24442.yaml
+++ b/http/cves/2021/CVE-2021-24442.yaml
@@ -28,7 +28,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/polls-widget/
     fofa-query: body=/wp-content/plugins/polls-widget/
     publicwww-query: "/wp-content/plugins/polls-widget/"
-  tags: time-based,wpscan,cve,cve2021,wp,wp-plugin,wordpress,polls-widget,sqli,wpdevart
+  tags: time-based-sqli,wpscan,cve,cve2021,wp,wp-plugin,wordpress,polls-widget,sqli,wpdevart
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24554.yaml b/http/cves/2021/CVE-2021-24554.yaml
index b805ade23f..3d3cbc0d03 100644
--- a/http/cves/2021/CVE-2021-24554.yaml
+++ b/http/cves/2021/CVE-2021-24554.yaml
@@ -30,7 +30,7 @@ info:
     vendor: freelancetoindia
     product: paytm-pay
     framework: wordpress
-  tags: time-based,cve,cve2021,sqli,wordpress,wp-plugin,wp,wp-paytm-pay,wpscan,freelancetoindia
+  tags: time-based-sqli,cve,cve2021,sqli,wordpress,wp-plugin,wp,wp-paytm-pay,wpscan,freelancetoindia
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24731.yaml b/http/cves/2021/CVE-2021-24731.yaml
index ca38b8ab64..6ef9fa9248 100644
--- a/http/cves/2021/CVE-2021-24731.yaml
+++ b/http/cves/2021/CVE-2021-24731.yaml
@@ -27,7 +27,7 @@ info:
     vendor: genetechsolutions
     product: pie_register
     framework: wordpress
-  tags: time-based,cve,cve2021,sqli,wpscan,wordpress,wp-plugin,wp,pie-register,unauth,genetechsolutions
+  tags: time-based-sqli,cve,cve2021,sqli,wpscan,wordpress,wp-plugin,wp,pie-register,unauth,genetechsolutions
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24762.yaml b/http/cves/2021/CVE-2021-24762.yaml
index a71caf93c7..c1dfcdada3 100644
--- a/http/cves/2021/CVE-2021-24762.yaml
+++ b/http/cves/2021/CVE-2021-24762.yaml
@@ -28,7 +28,7 @@ info:
     vendor: getperfectsurvey
     product: perfect_survey
     framework: wordpress
-  tags: time-based,cve2021,cve,wpscan,sqli,wp,wordpress,wp-plugin,edb,getperfectsurvey
+  tags: time-based-sqli,cve2021,cve,wpscan,sqli,wp,wordpress,wp-plugin,edb,getperfectsurvey
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24791.yaml b/http/cves/2021/CVE-2021-24791.yaml
index 1f08bbcc55..b761dd7eea 100644
--- a/http/cves/2021/CVE-2021-24791.yaml
+++ b/http/cves/2021/CVE-2021-24791.yaml
@@ -26,7 +26,7 @@ info:
     product: header_footer_code_manager
     framework: wordpress
     google-query: inurl:"/wp-content/plugins/wp-custom-pages/"
-  tags: time-based,cve2021,cve,wpscan,sqli,wp,wordpress,wp-plugin,authenticated,header-footer-code-manager,draftpress
+  tags: time-based-sqli,cve2021,cve,wpscan,sqli,wp,wordpress,wp-plugin,authenticated,header-footer-code-manager,draftpress
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24827.yaml b/http/cves/2021/CVE-2021-24827.yaml
index fde59625e3..8f76f4e871 100644
--- a/http/cves/2021/CVE-2021-24827.yaml
+++ b/http/cves/2021/CVE-2021-24827.yaml
@@ -30,7 +30,7 @@ info:
     vendor: asgaros
     product: asgaros_forum
     framework: wordpress
-  tags: time-based,cve2021,cve,wp-plugin,asgaros-forum,unauth,wpscan,wordpress,wp,sqli,asgaros
+  tags: time-based-sqli,cve2021,cve,wp-plugin,asgaros-forum,unauth,wpscan,wordpress,wp,sqli,asgaros
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24849.yaml b/http/cves/2021/CVE-2021-24849.yaml
index 2d72a46c4c..7fb3d40998 100644
--- a/http/cves/2021/CVE-2021-24849.yaml
+++ b/http/cves/2021/CVE-2021-24849.yaml
@@ -28,7 +28,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/wc-multivendor-marketplace
     fofa-query: body=/wp-content/plugins/wc-multivendor-marketplace
     publicwww-query: "/wp-content/plugins/wc-multivendor-marketplace"
-  tags: time-based,wpscan,cve,cve2021,wp,wp-plugin,wordpress,wc-multivendor-marketplace,sqli,wclovers
+  tags: time-based-sqli,wpscan,cve,cve2021,wp,wp-plugin,wordpress,wc-multivendor-marketplace,sqli,wclovers
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2021/CVE-2021-24862.yaml b/http/cves/2021/CVE-2021-24862.yaml
index ba6db346e0..ba2aca3af6 100644
--- a/http/cves/2021/CVE-2021-24862.yaml
+++ b/http/cves/2021/CVE-2021-24862.yaml
@@ -29,7 +29,7 @@ info:
     vendor: metagauss
     product: registrationmagic
     framework: wordpress
-  tags: time-based,cve,cve2021,wpscan,wp-plugin,wordpress,wp,registrationmagic,sqli,authenticated,packetstorm,metagauss
+  tags: time-based-sqli,cve,cve2021,wpscan,wp-plugin,wordpress,wp,registrationmagic,sqli,authenticated,packetstorm,metagauss
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24931.yaml b/http/cves/2021/CVE-2021-24931.yaml
index 819d02cb85..68906246e1 100644
--- a/http/cves/2021/CVE-2021-24931.yaml
+++ b/http/cves/2021/CVE-2021-24931.yaml
@@ -28,7 +28,7 @@ info:
     vendor: ays-pro
     product: secure_copy_content_protection_and_content_locking
     framework: wordpress
-  tags: time-based,cve2021,cve,wp-plugin,wp,packetstorm,unauth,wpscan,sqli,wordpress,secure-copy-content-protection,ays-pro
+  tags: time-based-sqli,cve2021,cve,wp-plugin,wp,packetstorm,unauth,wpscan,sqli,wordpress,secure-copy-content-protection,ays-pro
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-24943.yaml b/http/cves/2021/CVE-2021-24943.yaml
index ad8b050d79..16d75723d3 100644
--- a/http/cves/2021/CVE-2021-24943.yaml
+++ b/http/cves/2021/CVE-2021-24943.yaml
@@ -28,7 +28,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/registrations-for-the-events-calendar/
     fofa-query: body=/wp-content/plugins/registrations-for-the-events-calendar/
     publicwww-query: "/wp-content/plugins/registrations-for-the-events-calendar/"
-  tags: time-based,wpscan,cve,cve2021,wp,wp-plugin,wordpress,sqli,registrations-for-the-events-calendar,roundupwp
+  tags: time-based-sqli,wpscan,cve,cve2021,wp,wp-plugin,wordpress,sqli,registrations-for-the-events-calendar,roundupwp
 variables:
   text: "{{rand_base(5)}}"
 
diff --git a/http/cves/2021/CVE-2021-24946.yaml b/http/cves/2021/CVE-2021-24946.yaml
index d7b6faaf85..59727388a7 100644
--- a/http/cves/2021/CVE-2021-24946.yaml
+++ b/http/cves/2021/CVE-2021-24946.yaml
@@ -30,7 +30,7 @@ info:
     vendor: webnus
     product: modern_events_calendar_lite
     framework: wordpress
-  tags: time-based,cve2021,cve,sqli,packetstorm,wp,wp-plugin,unauth,wpscan,modern-events-calendar-lite,wordpress,webnus
+  tags: time-based-sqli,cve2021,cve,sqli,packetstorm,wp,wp-plugin,unauth,wpscan,modern-events-calendar-lite,wordpress,webnus
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-25114.yaml b/http/cves/2021/CVE-2021-25114.yaml
index b36b3d3c3a..9e12f13a1e 100644
--- a/http/cves/2021/CVE-2021-25114.yaml
+++ b/http/cves/2021/CVE-2021-25114.yaml
@@ -34,7 +34,7 @@ info:
     fofa-query: body=/wp-content/plugins/paid-memberships-pro/
     publicwww-query: /wp-content/plugins/paid-memberships-pro/
     google-query: inurl:"/wp-content/plugins/paid-memberships-pro"
-  tags: time-based,cve2021,cve,wp-plugin,wp,sqli,paid-memberships-pro,wpscan,wordpress,strangerstudios
+  tags: time-based-sqli,cve2021,cve,wp-plugin,wp,sqli,paid-memberships-pro,wpscan,wordpress,strangerstudios
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-25899.yaml b/http/cves/2021/CVE-2021-25899.yaml
index 8c5121af45..b1de16854f 100644
--- a/http/cves/2021/CVE-2021-25899.yaml
+++ b/http/cves/2021/CVE-2021-25899.yaml
@@ -31,7 +31,7 @@ info:
       - html:"AURALL"
       - http.html:"aurall"
     fofa-query: body="aurall"
-  tags: time-based,cve2021,cve,sqli,void,aurall
+  tags: time-based-sqli,cve2021,cve,sqli,void,aurall
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-27314.yaml b/http/cves/2021/CVE-2021-27314.yaml
index 97ff095d00..4f1f4a65e8 100644
--- a/http/cves/2021/CVE-2021-27314.yaml
+++ b/http/cves/2021/CVE-2021-27314.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: doctor_appointment_system_project
     product: doctor_appointment_system
-  tags: time-based,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
+  tags: time-based-sqli,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-27315.yaml b/http/cves/2021/CVE-2021-27315.yaml
index 3ae5a8dde8..87ea96e55a 100644
--- a/http/cves/2021/CVE-2021-27315.yaml
+++ b/http/cves/2021/CVE-2021-27315.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: doctor_appointment_system_project
     product: doctor_appointment_system
-  tags: time-based,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
+  tags: time-based-sqli,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-27316.yaml b/http/cves/2021/CVE-2021-27316.yaml
index 3d52672e27..c080e0ba9b 100644
--- a/http/cves/2021/CVE-2021-27316.yaml
+++ b/http/cves/2021/CVE-2021-27316.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: doctor_appointment_system_project
     product: doctor_appointment_system
-  tags: time-based,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
+  tags: time-based-sqli,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-27319.yaml b/http/cves/2021/CVE-2021-27319.yaml
index 22fb0694ab..7e032e4ae8 100644
--- a/http/cves/2021/CVE-2021-27319.yaml
+++ b/http/cves/2021/CVE-2021-27319.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: doctor_appointment_system_project
     product: doctor_appointment_system
-  tags: time-based,cve2021,cve,packetstorm,sqli,doctor-appointment-system,doctor_appointment_system_project
+  tags: time-based-sqli,cve2021,cve,packetstorm,sqli,doctor-appointment-system,doctor_appointment_system_project
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-27320.yaml b/http/cves/2021/CVE-2021-27320.yaml
index e1e8dc5737..c0543597ca 100644
--- a/http/cves/2021/CVE-2021-27320.yaml
+++ b/http/cves/2021/CVE-2021-27320.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: doctor_appointment_system_project
     product: doctor_appointment_system
-  tags: time-based,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
+  tags: time-based-sqli,cve2021,cve,sqli,doctor-appointment-system,packetstorm,doctor_appointment_system_project
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-3110.yaml b/http/cves/2021/CVE-2021-3110.yaml
index fff87abf57..d190e3056e 100644
--- a/http/cves/2021/CVE-2021-3110.yaml
+++ b/http/cves/2021/CVE-2021-3110.yaml
@@ -30,7 +30,7 @@ info:
     vendor: prestashop
     product: prestashop
     shodan-query: cpe:"cpe:2.3:a:prestashop:prestashop"
-  tags: time-based,cve,cve2021,sqli,prestshop,edb,prestashop
+  tags: time-based-sqli,cve,cve2021,sqli,prestshop,edb,prestashop
 
 http:
   - raw:
diff --git a/http/cves/2021/CVE-2021-39165.yaml b/http/cves/2021/CVE-2021-39165.yaml
index b4c8ed01e2..5532be45c6 100644
--- a/http/cves/2021/CVE-2021-39165.yaml
+++ b/http/cves/2021/CVE-2021-39165.yaml
@@ -31,7 +31,7 @@ info:
     product: cachet
     shodan-query: http.favicon.hash:-1606065523
     fofa-query: icon_hash=-1606065523
-  tags: time-based,cve,cve2021,cachet,sqli,chachethq
+  tags: time-based-sqli,cve,cve2021,cachet,sqli,chachethq
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0228.yaml b/http/cves/2022/CVE-2022-0228.yaml
index f3d606df33..d245f39b89 100644
--- a/http/cves/2022/CVE-2022-0228.yaml
+++ b/http/cves/2022/CVE-2022-0228.yaml
@@ -29,7 +29,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/popup-builder/
     fofa-query: body=/wp-content/plugins/popup-builder/
     publicwww-query: /wp-content/plugins/popup-builder/
-  tags: time-based,cve2022,cve,wordpress,wp-plugin,wp,wpscan,popup-builder,sygnoos,sqli
+  tags: time-based-sqli,cve2022,cve,wordpress,wp-plugin,wp,wpscan,popup-builder,sygnoos,sqli
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0349.yaml b/http/cves/2022/CVE-2022-0349.yaml
index 746c28c42d..97f247925e 100644
--- a/http/cves/2022/CVE-2022-0349.yaml
+++ b/http/cves/2022/CVE-2022-0349.yaml
@@ -30,7 +30,7 @@ info:
     vendor: wpdeveloper
     product: notificationx
     framework: wordpress
-  tags: time-based,cve,cve2022,wordpress,wp-plugin,wp,sqli,notificationx,wpscan,wpdeveloper
+  tags: time-based-sqli,cve,cve2022,wordpress,wp-plugin,wp,sqli,notificationx,wpscan,wpdeveloper
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0412.yaml b/http/cves/2022/CVE-2022-0412.yaml
index e6534841d9..1e8e887378 100644
--- a/http/cves/2022/CVE-2022-0412.yaml
+++ b/http/cves/2022/CVE-2022-0412.yaml
@@ -30,7 +30,7 @@ info:
     vendor: templateinvaders
     product: ti_woocommerce_wishlist
     framework: wordpress
-  tags: time-based,cve2022,cve,sqli,ti-woocommerce-wishlist,wpscan,woocommerce,wordpress,wp-plugin,wp,templateinvaders
+  tags: time-based-sqli,cve2022,cve,sqli,ti-woocommerce-wishlist,wpscan,woocommerce,wordpress,wp-plugin,wp,templateinvaders
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0651.yaml b/http/cves/2022/CVE-2022-0651.yaml
index ee05a34997..65db5bbdbb 100644
--- a/http/cves/2022/CVE-2022-0651.yaml
+++ b/http/cves/2022/CVE-2022-0651.yaml
@@ -31,7 +31,7 @@ info:
     fofa-query: body=/wp-content/plugins/wp-statistics/
     publicwww-query: /wp-content/plugins/wp-statistics/
     google-query: inurl:/wp-content/plugins/wp-statistics
-  tags: time-based,cve,cve2022,sqli,wp,wordpress,wp-plugin,wp-statistics,veronalabs
+  tags: time-based-sqli,cve,cve2022,sqli,wp,wordpress,wp-plugin,wp-statistics,veronalabs
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0658.yaml b/http/cves/2022/CVE-2022-0658.yaml
index b714517af1..64e36e0d4b 100644
--- a/http/cves/2022/CVE-2022-0658.yaml
+++ b/http/cves/2022/CVE-2022-0658.yaml
@@ -27,7 +27,7 @@ info:
     product: commonsbooking
     framework: wordpress
     google-query: inurl:/wp-content/plugin/commonsbooking/
-  tags: time-based,cve,cve2022,wordpress,wp-plugin,wp,commonsbooking,sqli,wpscan,wielebenwir
+  tags: time-based-sqli,cve,cve2022,wordpress,wp-plugin,wp,commonsbooking,sqli,wpscan,wielebenwir
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0693.yaml b/http/cves/2022/CVE-2022-0693.yaml
index c3bf42b592..5238432c35 100644
--- a/http/cves/2022/CVE-2022-0693.yaml
+++ b/http/cves/2022/CVE-2022-0693.yaml
@@ -30,7 +30,7 @@ info:
     vendor: devbunch
     product: master_elements
     framework: wordpress
-  tags: time-based,cve2022,cve,unauth,wpscan,wp-plugin,wp,sqli,wordpress,master-elements,devbunch
+  tags: time-based-sqli,cve2022,cve,unauth,wpscan,wp-plugin,wp,sqli,wordpress,master-elements,devbunch
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0747.yaml b/http/cves/2022/CVE-2022-0747.yaml
index 04f54f4175..eea10a4bfd 100644
--- a/http/cves/2022/CVE-2022-0747.yaml
+++ b/http/cves/2022/CVE-2022-0747.yaml
@@ -29,7 +29,7 @@ info:
     vendor: quantumcloud
     product: infographic_maker
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,wordpress,wp-plugin,wp,infographic-and-list-builder-ilist,wpscan,quantumcloud
+  tags: time-based-sqli,cve,cve2022,sqli,wordpress,wp-plugin,wp,infographic-and-list-builder-ilist,wpscan,quantumcloud
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0760.yaml b/http/cves/2022/CVE-2022-0760.yaml
index 3ea68cc374..866e47810e 100644
--- a/http/cves/2022/CVE-2022-0760.yaml
+++ b/http/cves/2022/CVE-2022-0760.yaml
@@ -30,7 +30,7 @@ info:
     vendor: quantumcloud
     product: simple_link_directory
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,wordpress,wp-plugin,wp,simple-link-directory,unauth,wpscan,quantumcloud
+  tags: time-based-sqli,cve,cve2022,sqli,wordpress,wp-plugin,wp,simple-link-directory,unauth,wpscan,quantumcloud
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0769.yaml b/http/cves/2022/CVE-2022-0769.yaml
index 122e57dc11..7cec3a1707 100644
--- a/http/cves/2022/CVE-2022-0769.yaml
+++ b/http/cves/2022/CVE-2022-0769.yaml
@@ -30,7 +30,7 @@ info:
     vendor: usersultra
     product: users_ultra
     framework: wordpress
-  tags: time-based,cve,cve2022,wp,users-ultra,wpscan,sqli,wordpress,wp-plugin,usersultra
+  tags: time-based-sqli,cve,cve2022,wp,users-ultra,wpscan,sqli,wordpress,wp-plugin,usersultra
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0773.yaml b/http/cves/2022/CVE-2022-0773.yaml
index dac85971a4..24d85d83be 100644
--- a/http/cves/2022/CVE-2022-0773.yaml
+++ b/http/cves/2022/CVE-2022-0773.yaml
@@ -28,7 +28,7 @@ info:
     vendor: documentor_project
     product: documentor
     framework: wordpress
-  tags: time-based,cve2022,cve,unauth,sqli,wp-plugin,wp,documentor-lite,wpscan,wordpress,documentor_project
+  tags: time-based-sqli,cve2022,cve,unauth,sqli,wp-plugin,wp,documentor-lite,wpscan,wordpress,documentor_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0784.yaml b/http/cves/2022/CVE-2022-0784.yaml
index a126d03354..1cc12bce2d 100644
--- a/http/cves/2022/CVE-2022-0784.yaml
+++ b/http/cves/2022/CVE-2022-0784.yaml
@@ -30,7 +30,7 @@ info:
     vendor: title_experiments_free_project
     product: title_experiments_free
     framework: wordpress
-  tags: time-based,cve2022,cve,wpscan,wp-plugin,wp,sqli,wp-experiments-free,unauth,wordpress,title_experiments_free_project
+  tags: time-based-sqli,cve2022,cve,wpscan,wp-plugin,wp,sqli,wp-experiments-free,unauth,wordpress,title_experiments_free_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0785.yaml b/http/cves/2022/CVE-2022-0785.yaml
index 1ea38cad7e..6224663c84 100644
--- a/http/cves/2022/CVE-2022-0785.yaml
+++ b/http/cves/2022/CVE-2022-0785.yaml
@@ -30,7 +30,7 @@ info:
     vendor: daily_prayer_time_project
     product: daily_prayer_time
     framework: wordpress
-  tags: time-based,cve2022,cve,sqli,wordpress,wp-plugin,unauth,daily-prayer-time-for-mosques,wpscan,wp,daily_prayer_time_project
+  tags: time-based-sqli,cve2022,cve,sqli,wordpress,wp-plugin,unauth,daily-prayer-time-for-mosques,wpscan,wp,daily_prayer_time_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0786.yaml b/http/cves/2022/CVE-2022-0786.yaml
index 3ac92d8cc3..2d6abb3f5d 100644
--- a/http/cves/2022/CVE-2022-0786.yaml
+++ b/http/cves/2022/CVE-2022-0786.yaml
@@ -30,7 +30,7 @@ info:
     vendor: iqonic
     product: kivicare
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,kivicare-clinic-management-system,unauth,wordpress,wp-plugin,wp,wpscan,iqonic
+  tags: time-based-sqli,cve,cve2022,sqli,kivicare-clinic-management-system,unauth,wordpress,wp-plugin,wp,wpscan,iqonic
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0787.yaml b/http/cves/2022/CVE-2022-0787.yaml
index e34b703e26..0bc1632811 100644
--- a/http/cves/2022/CVE-2022-0787.yaml
+++ b/http/cves/2022/CVE-2022-0787.yaml
@@ -26,7 +26,7 @@ info:
     vendor: limit_login_attempts_project
     product: limit_login_attempts
     framework: wordpress
-  tags: time-based,cve,cve2022,wpscan,sqli,wordpress,wp-plugin,wp,wp-limit-failed-login-attempts,limit_login_attempts_project
+  tags: time-based-sqli,cve,cve2022,wpscan,sqli,wordpress,wp-plugin,wp,wp-limit-failed-login-attempts,limit_login_attempts_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0788.yaml b/http/cves/2022/CVE-2022-0788.yaml
index 1264ca0b5c..4c4842c703 100644
--- a/http/cves/2022/CVE-2022-0788.yaml
+++ b/http/cves/2022/CVE-2022-0788.yaml
@@ -30,7 +30,7 @@ info:
     vendor: wpmet
     product: wp_fundraising_donation_and_crowdfunding_platform
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,wordpress,wp-plugin,wp,wp-fundraising-donation,unauth,wpscan,wpmet
+  tags: time-based-sqli,cve,cve2022,sqli,wordpress,wp-plugin,wp,wp-fundraising-donation,unauth,wpscan,wpmet
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0826.yaml b/http/cves/2022/CVE-2022-0826.yaml
index 27db049a13..1a9c622c3b 100644
--- a/http/cves/2022/CVE-2022-0826.yaml
+++ b/http/cves/2022/CVE-2022-0826.yaml
@@ -30,7 +30,7 @@ info:
     vendor: wp-video-gallery-free_project
     product: wp-video-gallery-free
     framework: wordpress
-  tags: time-based,cve,cve2022,wp-plugin,wpscan,wordpress,wp,sqli,wp-video-gallery-free,unauth,wp-video-gallery-free_project
+  tags: time-based-sqli,cve,cve2022,wp-plugin,wpscan,wordpress,wp,sqli,wp-video-gallery-free,unauth,wp-video-gallery-free_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0827.yaml b/http/cves/2022/CVE-2022-0827.yaml
index 1167fc435d..6f49e12293 100644
--- a/http/cves/2022/CVE-2022-0827.yaml
+++ b/http/cves/2022/CVE-2022-0827.yaml
@@ -30,7 +30,7 @@ info:
     vendor: presspage
     product: bestbooks
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,wpscan,wordpress,wp-plugin,wp,bestbooks,unauthenticated,presspage
+  tags: time-based-sqli,cve,cve2022,sqli,wpscan,wordpress,wp-plugin,wp,bestbooks,unauthenticated,presspage
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0846.yaml b/http/cves/2022/CVE-2022-0846.yaml
index 9b5a838ab7..cf8477c1a8 100644
--- a/http/cves/2022/CVE-2022-0846.yaml
+++ b/http/cves/2022/CVE-2022-0846.yaml
@@ -29,7 +29,7 @@ info:
     vendor: speakout\!_email_petitions_project
     product: speakout\!_email_petitions
     framework: wordpress
-  tags: time-based,cve,cve2022,wordpress,wp-plugin,wp,unauth,wpscan,sqli,speakout,speakout-email-petitions,speakout\!_email_petitions_project
+  tags: time-based-sqli,cve,cve2022,wordpress,wp-plugin,wp,unauth,wpscan,sqli,speakout,speakout-email-petitions,speakout\!_email_petitions_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0867.yaml b/http/cves/2022/CVE-2022-0867.yaml
index a65f4a5701..5c9f4775e5 100644
--- a/http/cves/2022/CVE-2022-0867.yaml
+++ b/http/cves/2022/CVE-2022-0867.yaml
@@ -30,7 +30,7 @@ info:
     vendor: reputeinfosystems
     product: pricing_table
     framework: wordpress
-  tags: time-based,cve,cve2022,unauth,wp,wordpress,wp-plugin,arprice-responsive-pricing-table,sqli,wpscan,reputeinfosystems
+  tags: time-based-sqli,cve,cve2022,unauth,wp,wordpress,wp-plugin,arprice-responsive-pricing-table,sqli,wpscan,reputeinfosystems
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0948.yaml b/http/cves/2022/CVE-2022-0948.yaml
index e4fc9db00a..6774a235c0 100644
--- a/http/cves/2022/CVE-2022-0948.yaml
+++ b/http/cves/2022/CVE-2022-0948.yaml
@@ -30,7 +30,7 @@ info:
     vendor: pluginbazaar
     product: order_listener_for_woocommerce
     framework: wordpress
-  tags: time-based,cve,cve2022,wp,unauth,sqli,woc-order-alert,wpscan,wordpress,wp-plugin,pluginbazaar
+  tags: time-based-sqli,cve,cve2022,wp,unauth,sqli,woc-order-alert,wpscan,wordpress,wp-plugin,pluginbazaar
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-0949.yaml b/http/cves/2022/CVE-2022-0949.yaml
index 591fc55360..797e4e70a2 100644
--- a/http/cves/2022/CVE-2022-0949.yaml
+++ b/http/cves/2022/CVE-2022-0949.yaml
@@ -29,7 +29,7 @@ info:
     vendor: stopbadbots
     product: block_and_stop_bad_bots
     framework: wordpress
-  tags: time-based,cve,cve2022,stopbadbots,wp-plugin,wp,unauth,wpscan,sqli,wordpress
+  tags: time-based-sqli,cve,cve2022,stopbadbots,wp-plugin,wp,unauth,wpscan,sqli,wordpress
 variables:
   IP: '{{rand_ip("1.1.1.0/24")}}'
 
diff --git a/http/cves/2022/CVE-2022-1013.yaml b/http/cves/2022/CVE-2022-1013.yaml
index 6ec84641ec..cbd5889df1 100644
--- a/http/cves/2022/CVE-2022-1013.yaml
+++ b/http/cves/2022/CVE-2022-1013.yaml
@@ -29,7 +29,7 @@ info:
     vendor: ays-pro
     product: personal_dictionary
     framework: wordpress
-  tags: time-based,cve,cve2022,wp,unauth,wpscan,sqli,wordpress,wp-plugin,personal-dictionary,ays-pro
+  tags: time-based-sqli,cve,cve2022,wp,unauth,wpscan,sqli,wordpress,wp-plugin,personal-dictionary,ays-pro
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-1057.yaml b/http/cves/2022/CVE-2022-1057.yaml
index 1c58978fd4..37ce43aed4 100644
--- a/http/cves/2022/CVE-2022-1057.yaml
+++ b/http/cves/2022/CVE-2022-1057.yaml
@@ -30,7 +30,7 @@ info:
     vendor: varktech
     product: pricing_deals_for_woocommerce
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,wpscan,wordpress,wp-plugin,wp,pricing-deals-for-woocommerce,unauth,varktech
+  tags: time-based-sqli,cve,cve2022,sqli,wpscan,wordpress,wp-plugin,wp,pricing-deals-for-woocommerce,unauth,varktech
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-1768.yaml b/http/cves/2022/CVE-2022-1768.yaml
index c07e4ef97f..e47277e55c 100644
--- a/http/cves/2022/CVE-2022-1768.yaml
+++ b/http/cves/2022/CVE-2022-1768.yaml
@@ -30,7 +30,7 @@ info:
     vendor: carrcommunications
     product: rsvpmaker
     framework: wordpress
-  tags: time-based,cve,cve2022,wordpress,wp-plugin,wp,sqli,rsvpmaker,carrcommunications
+  tags: time-based-sqli,cve,cve2022,wordpress,wp-plugin,wp,sqli,rsvpmaker,carrcommunications
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-1883.yaml b/http/cves/2022/CVE-2022-1883.yaml
index 21846e5778..b8463f79b1 100644
--- a/http/cves/2022/CVE-2022-1883.yaml
+++ b/http/cves/2022/CVE-2022-1883.yaml
@@ -28,7 +28,7 @@ info:
     max-request: 1
     vendor: camptocamp
     product: terraboard
-  tags: time-based,cve,cve2022,terraboard,sqli,huntr,camptocamp
+  tags: time-based-sqli,cve,cve2022,terraboard,sqli,huntr,camptocamp
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-22897.yaml b/http/cves/2022/CVE-2022-22897.yaml
index 3da520ec18..24ffcd26d3 100644
--- a/http/cves/2022/CVE-2022-22897.yaml
+++ b/http/cves/2022/CVE-2022-22897.yaml
@@ -31,7 +31,7 @@ info:
     shodan-query:
       - "http.component:\"Prestashop\""
       - http.component:"prestashop"
-  tags: time-based,cve,cve2022,packetstorm,prestashop,sqli,unauth,apollotheme
+  tags: time-based-sqli,cve,cve2022,packetstorm,prestashop,sqli,unauth,apollotheme
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-24223.yaml b/http/cves/2022/CVE-2022-24223.yaml
index 8a6b4070e9..86cd020a3d 100644
--- a/http/cves/2022/CVE-2022-24223.yaml
+++ b/http/cves/2022/CVE-2022-24223.yaml
@@ -28,7 +28,7 @@ info:
     max-request: 1
     vendor: thedigitalcraft
     product: atomcms
-  tags: time-based,cve,cve2022,packetstorm,sqli,atom,cms,thedigitalcraft
+  tags: time-based-sqli,cve,cve2022,packetstorm,sqli,atom,cms,thedigitalcraft
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-24265.yaml b/http/cves/2022/CVE-2022-24265.yaml
index 04d0a672c1..9d44c2e1fa 100644
--- a/http/cves/2022/CVE-2022-24265.yaml
+++ b/http/cves/2022/CVE-2022-24265.yaml
@@ -29,7 +29,7 @@ info:
     max-request: 2
     vendor: cuppacms
     product: cuppacms
-  tags: time-based,cve2022,cve,sqli,cuppa,authenticated,cuppacms
+  tags: time-based-sqli,cve2022,cve,sqli,cuppa,authenticated,cuppacms
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-24266.yaml b/http/cves/2022/CVE-2022-24266.yaml
index 1ae7115add..1741b91789 100644
--- a/http/cves/2022/CVE-2022-24266.yaml
+++ b/http/cves/2022/CVE-2022-24266.yaml
@@ -29,7 +29,7 @@ info:
     max-request: 2
     vendor: cuppacms
     product: cuppacms
-  tags: time-based,cve,cve2022,sqli,cuppa,authenticated,cuppacms
+  tags: time-based-sqli,cve,cve2022,sqli,cuppa,authenticated,cuppacms
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-2467.yaml b/http/cves/2022/CVE-2022-2467.yaml
index 823773f984..516b94de3a 100644
--- a/http/cves/2022/CVE-2022-2467.yaml
+++ b/http/cves/2022/CVE-2022-2467.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: garage_management_system_project
     product: garage_management_system
-  tags: time-based,cve,cve2022,sourcecodester,garagemanagementsystem,sqli,garage_management_system_project
+  tags: time-based-sqli,cve,cve2022,sourcecodester,garagemanagementsystem,sqli,garage_management_system_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-25148.yaml b/http/cves/2022/CVE-2022-25148.yaml
index 10389dd1b5..8982866299 100644
--- a/http/cves/2022/CVE-2022-25148.yaml
+++ b/http/cves/2022/CVE-2022-25148.yaml
@@ -31,7 +31,7 @@ info:
     fofa-query: body=/wp-content/plugins/wp-statistics/
     publicwww-query: /wp-content/plugins/wp-statistics/
     google-query: inurl:/wp-content/plugins/wp-statistics
-  tags: time-based,cve,cve2022,packetstorm,sqli,wpscan,wordpress,wp-plugin,wp,wp-statistics,veronalabs
+  tags: time-based-sqli,cve,cve2022,packetstorm,sqli,wpscan,wordpress,wp-plugin,wp,wp-statistics,veronalabs
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-25149.yaml b/http/cves/2022/CVE-2022-25149.yaml
index 1c279e67a5..011f16ecca 100644
--- a/http/cves/2022/CVE-2022-25149.yaml
+++ b/http/cves/2022/CVE-2022-25149.yaml
@@ -30,7 +30,7 @@ info:
     fofa-query: body=/wp-content/plugins/wp-statistics/
     publicwww-query: "/wp-content/plugins/wp-statistics/"
     google-query: inurl:/wp-content/plugins/wp-statistics
-  tags: time-based,cve2022,cve,sqli,wpscan,wordpress,wp-plugin,wp,wp-statistics,veronalabs
+  tags: time-based-sqli,cve2022,cve,sqli,wpscan,wordpress,wp-plugin,wp,wp-statistics,veronalabs
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-27984.yaml b/http/cves/2022/CVE-2022-27984.yaml
index 3f7f52f5df..b063c00671 100644
--- a/http/cves/2022/CVE-2022-27984.yaml
+++ b/http/cves/2022/CVE-2022-27984.yaml
@@ -28,7 +28,7 @@ info:
     max-request: 2
     vendor: cuppacms
     product: cuppacms
-  tags: time-based,cve,cve2022,sqli,cuppa,authenticated,cuppacms
+  tags: time-based-sqli,cve,cve2022,sqli,cuppa,authenticated,cuppacms
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-28032.yaml b/http/cves/2022/CVE-2022-28032.yaml
index 879e3277ac..81aa40426a 100644
--- a/http/cves/2022/CVE-2022-28032.yaml
+++ b/http/cves/2022/CVE-2022-28032.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: thedigitalcraft
     product: atomcms
-  tags: time-based,cve,cve2022,sqli,atom,cms,thedigitalcraft
+  tags: time-based-sqli,cve,cve2022,sqli,atom,cms,thedigitalcraft
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-3142.yaml b/http/cves/2022/CVE-2022-3142.yaml
index 9ecc5024f5..bf470e3c58 100644
--- a/http/cves/2022/CVE-2022-3142.yaml
+++ b/http/cves/2022/CVE-2022-3142.yaml
@@ -30,7 +30,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/nex-forms-express-wp-form-builder/
     fofa-query: body=/wp-content/plugins/nex-forms-express-wp-form-builder/
     publicwww-query: /wp-content/plugins/nex-forms-express-wp-form-builder/
-  tags: time-based,cve,cve2022,wpscan,packetstorm,wordpress,sqli,wp-plugin,wp,authenticated,basixonline
+  tags: time-based-sqli,cve,cve2022,wpscan,packetstorm,wordpress,sqli,wp-plugin,wp,authenticated,basixonline
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-31499.yaml b/http/cves/2022/CVE-2022-31499.yaml
index fbadaa25a8..e283dd0d3c 100644
--- a/http/cves/2022/CVE-2022-31499.yaml
+++ b/http/cves/2022/CVE-2022-31499.yaml
@@ -39,7 +39,7 @@ info:
     google-query:
       - intitle:"linear emerge"
       - intitle:"emerge"
-  tags: time-based,cve,cve2022,packetstorm,emerge,rce,nortekcontrol
+  tags: time-based-sqli,cve,cve2022,packetstorm,emerge,rce,nortekcontrol
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-31976.yaml b/http/cves/2022/CVE-2022-31976.yaml
index 57fdd25599..74254745ee 100644
--- a/http/cves/2022/CVE-2022-31976.yaml
+++ b/http/cves/2022/CVE-2022-31976.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: online_fire_reporting_system_project
     product: online_fire_reporting_system
-  tags: time-based,cve,cve2022,sqli,online-fire-reporting,online_fire_reporting_system_project
+  tags: time-based-sqli,cve,cve2022,sqli,online-fire-reporting,online_fire_reporting_system_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-31977.yaml b/http/cves/2022/CVE-2022-31977.yaml
index 6efc570904..268fb85fd5 100644
--- a/http/cves/2022/CVE-2022-31977.yaml
+++ b/http/cves/2022/CVE-2022-31977.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: online_fire_reporting_system_project
     product: online_fire_reporting_system
-  tags: time-based,cve,cve2022,sqli,online-fire-reporting,online_fire_reporting_system_project
+  tags: time-based-sqli,cve,cve2022,sqli,online-fire-reporting,online_fire_reporting_system_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-31978.yaml b/http/cves/2022/CVE-2022-31978.yaml
index f9bbd3fe98..98237bd59b 100644
--- a/http/cves/2022/CVE-2022-31978.yaml
+++ b/http/cves/2022/CVE-2022-31978.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: online_fire_reporting_system_project
     product: online_fire_reporting_system
-  tags: time-based,cve,cve2022,sqli,online-fire-reporting,online_fire_reporting_system_project
+  tags: time-based-sqli,cve,cve2022,sqli,online-fire-reporting,online_fire_reporting_system_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-33965.yaml b/http/cves/2022/CVE-2022-33965.yaml
index 2701aef218..db39a92c1e 100644
--- a/http/cves/2022/CVE-2022-33965.yaml
+++ b/http/cves/2022/CVE-2022-33965.yaml
@@ -33,7 +33,7 @@ info:
     shodan-query: http.html:"wp-stats-manager"
     fofa-query: body="wp-stats-manager"
     google-query: inurl:"/wp-content/plugins/wp-stats-manager"
-  tags: time-based,cve2022,cve,wordpress,wp-plugin,wp,unauth,sqli,wp-stats-manager,plugins-market
+  tags: time-based-sqli,cve2022,cve,wordpress,wp-plugin,wp,unauth,sqli,wp-stats-manager,plugins-market
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-3768.yaml b/http/cves/2022/CVE-2022-3768.yaml
index 100346d080..a5a2cce21b 100644
--- a/http/cves/2022/CVE-2022-3768.yaml
+++ b/http/cves/2022/CVE-2022-3768.yaml
@@ -29,7 +29,7 @@ info:
     vendor: wpsmartcontracts
     product: wpsmartcontracts
     framework: wordpress
-  tags: time-based,cve,cve2022,wp-smart-contracts,wpscan,wp-plugin,sqli,wordpress,wp,authenticated,wpsmartcontracts
+  tags: time-based-sqli,cve,cve2022,wp-smart-contracts,wpscan,wp-plugin,sqli,wordpress,wp,authenticated,wpsmartcontracts
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-3800.yaml b/http/cves/2022/CVE-2022-3800.yaml
index 7d0914e32b..72f58edd29 100644
--- a/http/cves/2022/CVE-2022-3800.yaml
+++ b/http/cves/2022/CVE-2022-3800.yaml
@@ -27,7 +27,7 @@ info:
     max-request: 1
     vendor: ibax
     product: go-ibax
-  tags: time-based,cve2022,cve,ibax,go-ibax,sqli
+  tags: time-based-sqli,cve2022,cve,ibax,go-ibax,sqli
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-40032.yaml b/http/cves/2022/CVE-2022-40032.yaml
index dbd896729d..734887dc5d 100644
--- a/http/cves/2022/CVE-2022-40032.yaml
+++ b/http/cves/2022/CVE-2022-40032.yaml
@@ -25,7 +25,7 @@ info:
     max-request: 1
     vendor: simple_task_managing_system_project
     product: simple_task_managing_system
-  tags: time-based,cve,cve2022,packetstorm,simple-task,stms,sqli,simple_task_managing_system_project
+  tags: time-based-sqli,cve,cve2022,packetstorm,simple-task,stms,sqli,simple_task_managing_system_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-4049.yaml b/http/cves/2022/CVE-2022-4049.yaml
index 4a37fb4b28..11afd80c0e 100644
--- a/http/cves/2022/CVE-2022-4049.yaml
+++ b/http/cves/2022/CVE-2022-4049.yaml
@@ -28,7 +28,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/wp-user/
     fofa-query: body=/wp-content/plugins/wp-user/
     publicwww-query: /wp-content/plugins/wp-user/
-  tags: time-based,cve,cve2022,sqli,wpscan,wordpress,wp-plugin,wp,wp-user,unauth,wp_user_project
+  tags: time-based-sqli,cve,cve2022,sqli,wpscan,wordpress,wp-plugin,wp,wp-user,unauth,wp_user_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-4050.yaml b/http/cves/2022/CVE-2022-4050.yaml
index 12de61acfe..ab54d781e2 100644
--- a/http/cves/2022/CVE-2022-4050.yaml
+++ b/http/cves/2022/CVE-2022-4050.yaml
@@ -30,7 +30,7 @@ info:
     vendor: beardev
     product: joomsport
     framework: wordpress
-  tags: time-based,cve,cve2022,wpscan,wp-plugin,wp,joomsport-sports-league-results-management,wordpress,sqli,unauth,beardev
+  tags: time-based-sqli,cve,cve2022,wpscan,wp-plugin,wp,joomsport-sports-league-results-management,wordpress,sqli,unauth,beardev
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-4059.yaml b/http/cves/2022/CVE-2022-4059.yaml
index e8cb84f659..b513a6baef 100644
--- a/http/cves/2022/CVE-2022-4059.yaml
+++ b/http/cves/2022/CVE-2022-4059.yaml
@@ -28,7 +28,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/cryptocurrency-widgets-pack/
     fofa-query: body=/wp-content/plugins/cryptocurrency-widgets-pack/
     publicwww-query: /wp-content/plugins/cryptocurrency-widgets-pack/
-  tags: time-based,cve,cve2022,wp,wp-plugin,wordpress,wpscan,sqli,blocksera
+  tags: time-based-sqli,cve,cve2022,wp,wp-plugin,wordpress,wpscan,sqli,blocksera
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-4117.yaml b/http/cves/2022/CVE-2022-4117.yaml
index ca6e099de9..d0354c3393 100644
--- a/http/cves/2022/CVE-2022-4117.yaml
+++ b/http/cves/2022/CVE-2022-4117.yaml
@@ -30,7 +30,7 @@ info:
     vendor: iws-geo-form-fields_project
     product: iws-geo-form-fields
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,wordpress,wp-plugin,wp,iws-geo-form-fields,wpscan,iws-geo-form-fields_project
+  tags: time-based-sqli,cve,cve2022,sqli,wordpress,wp-plugin,wp,iws-geo-form-fields,wpscan,iws-geo-form-fields_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-44290.yaml b/http/cves/2022/CVE-2022-44290.yaml
index deedd1396a..3b9aded4e6 100644
--- a/http/cves/2022/CVE-2022-44290.yaml
+++ b/http/cves/2022/CVE-2022-44290.yaml
@@ -24,7 +24,7 @@ info:
     max-request: 2
     vendor: webtareas_project
     product: webtareas
-  tags: time-based,cve,cve2022,sqli,webtareas,authenticated,intrusive,webtareas_project
+  tags: time-based-sqli,cve,cve2022,sqli,webtareas,authenticated,intrusive,webtareas_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-44291.yaml b/http/cves/2022/CVE-2022-44291.yaml
index eb926999cb..c13f8fabb4 100644
--- a/http/cves/2022/CVE-2022-44291.yaml
+++ b/http/cves/2022/CVE-2022-44291.yaml
@@ -24,7 +24,7 @@ info:
     max-request: 2
     vendor: webtareas_project
     product: webtareas
-  tags: time-based,cve,cve2022,sqli,webtareas,authenticated,intrusive,webtareas_project
+  tags: time-based-sqli,cve,cve2022,sqli,webtareas,authenticated,intrusive,webtareas_project
 
 http:
   - raw:
diff --git a/http/cves/2022/CVE-2022-45805.yaml b/http/cves/2022/CVE-2022-45805.yaml
index d4887a6353..8a7965ed39 100644
--- a/http/cves/2022/CVE-2022-45805.yaml
+++ b/http/cves/2022/CVE-2022-45805.yaml
@@ -29,7 +29,7 @@ info:
     vendor: paytm
     product: payment_gateway
     framework: wordpress
-  tags: time-based,cve,cve2022,sqli,wordpress,wp-plugin,wp,paytm-payments,authenticated,paytm
+  tags: time-based-sqli,cve,cve2022,sqli,wordpress,wp-plugin,wp,paytm-payments,authenticated,paytm
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-0261.yaml b/http/cves/2023/CVE-2023-0261.yaml
index fdeeec8675..0a994785d5 100644
--- a/http/cves/2023/CVE-2023-0261.yaml
+++ b/http/cves/2023/CVE-2023-0261.yaml
@@ -28,7 +28,7 @@ info:
     vendor: ljapps
     product: wp_tripadvisor_review_slider
     framework: wordpress
-  tags: time-based,cve2023,cve,wordpress,wp,wp-tripadvisor-review-slider,auth,sqli,wp-plugin,wpscan,ljapps
+  tags: time-based-sqli,cve2023,cve,wordpress,wp,wp-tripadvisor-review-slider,auth,sqli,wp-plugin,wpscan,ljapps
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-0600.yaml b/http/cves/2023/CVE-2023-0600.yaml
index 38a169edc1..15444215dc 100644
--- a/http/cves/2023/CVE-2023-0600.yaml
+++ b/http/cves/2023/CVE-2023-0600.yaml
@@ -29,7 +29,7 @@ info:
     fofa-query: body="wp-stats-manager"
     google-query: inurl:"/wp-content/plugins/wp-stats-manager"
     public-www: /wp-content/plugins/wp-stats-manager/
-  tags: time-based,cve,cve2023,wp,wp-plugin,wordpress,wpscan,unauth,wp-stats-manager,sqli,plugins-market
+  tags: time-based-sqli,cve,cve2023,wp,wp-plugin,wordpress,wpscan,unauth,wp-stats-manager,sqli,plugins-market
 variables:
   str: '{{rand_int(100000, 999999)}}'
 
diff --git a/http/cves/2023/CVE-2023-0630.yaml b/http/cves/2023/CVE-2023-0630.yaml
index d9a32e13b5..fa599070a8 100644
--- a/http/cves/2023/CVE-2023-0630.yaml
+++ b/http/cves/2023/CVE-2023-0630.yaml
@@ -29,7 +29,7 @@ info:
     vendor: wp-slimstat
     product: slimstat_analytics
     framework: wordpress
-  tags: time-based,cve2023,cve,wpscan,wp-slimstat,wp,wp-plugin,sqli,wordpress,authenticated
+  tags: time-based-sqli,cve2023,cve,wpscan,wp-slimstat,wp,wp-plugin,sqli,wordpress,authenticated
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-0900.yaml b/http/cves/2023/CVE-2023-0900.yaml
index 1c61c675ed..7016fbd79a 100644
--- a/http/cves/2023/CVE-2023-0900.yaml
+++ b/http/cves/2023/CVE-2023-0900.yaml
@@ -27,7 +27,7 @@ info:
     shodan-query: http.html:wp-content/plugins/ap-pricing-tables-lite
     fofa-query: body=wp-content/plugins/ap-pricing-tables-lite
     publicwww-query: "wp-content/plugins/ap-pricing-tables-lite"
-  tags: time-based,cve2023,cve,sqli,wordpress,wp-plugin,wp,authenticated,wpscan,ap-pricing-tables-lite,wpdevart
+  tags: time-based-sqli,cve2023,cve,sqli,wordpress,wp-plugin,wp,authenticated,wpscan,ap-pricing-tables-lite,wpdevart
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-1408.yaml b/http/cves/2023/CVE-2023-1408.yaml
index 01358f2b22..73f73628b1 100644
--- a/http/cves/2023/CVE-2023-1408.yaml
+++ b/http/cves/2023/CVE-2023-1408.yaml
@@ -27,7 +27,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/video-list-manager/
     fofa-query: body=/wp-content/plugins/video-list-manager/
     publicwww-query: /wp-content/plugins/video-list-manager/
-  tags: time-based,cve,cve2023,wpscan,sqli,wordpress,wp-plugin,wp,authenticated,video_list_manager_project
+  tags: time-based-sqli,cve,cve2023,wpscan,sqli,wordpress,wp-plugin,wp,authenticated,video_list_manager_project
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-1730.yaml b/http/cves/2023/CVE-2023-1730.yaml
index bcf0192be4..772bda0bcb 100644
--- a/http/cves/2023/CVE-2023-1730.yaml
+++ b/http/cves/2023/CVE-2023-1730.yaml
@@ -28,7 +28,7 @@ info:
     vendor: supportcandy
     product: supportcandy
     framework: wordpress
-  tags: time-based,cve2023,cve,sqli,wpscan,wordpress,supportcandy,unauth
+  tags: time-based-sqli,cve2023,cve,sqli,wpscan,wordpress,supportcandy,unauth
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-2130.yaml b/http/cves/2023/CVE-2023-2130.yaml
index 8ee1ca8409..bf443f2260 100644
--- a/http/cves/2023/CVE-2023-2130.yaml
+++ b/http/cves/2023/CVE-2023-2130.yaml
@@ -29,7 +29,7 @@ info:
     max-request: 1
     vendor: purchase_order_management_system_project
     product: purchase_order_management_system
-  tags: time-based,cve2023,cve,sqli,purchase-order-management-system,purchase_order_management_system_project
+  tags: time-based-sqli,cve2023,cve,sqli,purchase-order-management-system,purchase_order_management_system_project
 
 http:
   - method: GET
diff --git a/http/cves/2023/CVE-2023-23488.yaml b/http/cves/2023/CVE-2023-23488.yaml
index 821ca78714..d640878909 100644
--- a/http/cves/2023/CVE-2023-23488.yaml
+++ b/http/cves/2023/CVE-2023-23488.yaml
@@ -34,7 +34,7 @@ info:
     fofa-query: body=/wp-content/plugins/paid-memberships-pro/
     publicwww-query: /wp-content/plugins/paid-memberships-pro/
     google-query: inurl:"/wp-content/plugins/paid-memberships-pro"
-  tags: time-based,cve2023,cve,paid-memberships-pro,wordpress,tenable,packetstorm,wp-plugin,sqli,wp,strangerstudios
+  tags: time-based-sqli,cve2023,cve,paid-memberships-pro,wordpress,tenable,packetstorm,wp-plugin,sqli,wp,strangerstudios
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-23489.yaml b/http/cves/2023/CVE-2023-23489.yaml
index a983c62260..7173b799d2 100644
--- a/http/cves/2023/CVE-2023-23489.yaml
+++ b/http/cves/2023/CVE-2023-23489.yaml
@@ -30,7 +30,7 @@ info:
     vendor: sandhillsdev
     product: easy_digital_downloads
     framework: wordpress
-  tags: time-based,cve,cve2023,easy-digital-downloads,unauth,wpscan,wordpress,wp,wp-plugin,sqli,tenable,sandhillsdev
+  tags: time-based-sqli,cve,cve2023,easy-digital-downloads,unauth,wpscan,wordpress,wp,wp-plugin,sqli,tenable,sandhillsdev
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-27032.yaml b/http/cves/2023/CVE-2023-27032.yaml
index 119c1d8d5e..5a9250c6f9 100644
--- a/http/cves/2023/CVE-2023-27032.yaml
+++ b/http/cves/2023/CVE-2023-27032.yaml
@@ -24,7 +24,7 @@ info:
     product: "popup_module_\\(on_entering\\,_exit_popup\\,_add_product\\)_and_newsletter"
     framework: prestashop
     shodan-query: "http.component:\"prestashop\""
-  tags: time-based,cve,cve2023,sqli,prestashop,advancedpopupcreator,idnovate
+  tags: time-based-sqli,cve,cve2023,sqli,prestashop,advancedpopupcreator,idnovate
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-27034.yaml b/http/cves/2023/CVE-2023-27034.yaml
index beec74393e..ca487aa605 100644
--- a/http/cves/2023/CVE-2023-27034.yaml
+++ b/http/cves/2023/CVE-2023-27034.yaml
@@ -29,7 +29,7 @@ info:
     vendor: joommasters
     product: jms_blog
     framework: prestashop
-  tags: time-based,cve2023,cve,prestashop,prestashop-module,sqli,intrusive,joommasters
+  tags: time-based-sqli,cve2023,cve,prestashop,prestashop-module,sqli,intrusive,joommasters
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2023/CVE-2023-27847.yaml b/http/cves/2023/CVE-2023-27847.yaml
index 6b1df7cc96..b6a2fd23c6 100644
--- a/http/cves/2023/CVE-2023-27847.yaml
+++ b/http/cves/2023/CVE-2023-27847.yaml
@@ -24,7 +24,7 @@ info:
     framework: prestashop
     shodan-query: html:"/xipblog"
     fofa-query: app="Prestashop"
-  tags: time-based,cve,cve2023,prestashop,sqli,xipblog
+  tags: time-based-sqli,cve,cve2023,prestashop,sqli,xipblog
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2023/CVE-2023-28662.yaml b/http/cves/2023/CVE-2023-28662.yaml
index 77078b1491..75db515379 100644
--- a/http/cves/2023/CVE-2023-28662.yaml
+++ b/http/cves/2023/CVE-2023-28662.yaml
@@ -30,7 +30,7 @@ info:
     framework: wordpress
     shodan-query: http.html:"/wp-content/plugins/gift-voucher/"
     fofa-query: "body=\"/wp-content/plugins/gift-voucher/\""
-  tags: time-based,cve,cve2023,wordpress,wp,wp-plugin,sqli,unauth,gift-voucher,codemenschen
+  tags: time-based-sqli,cve,cve2023,wordpress,wp,wp-plugin,sqli,unauth,gift-voucher,codemenschen
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2023/CVE-2023-30150.yaml b/http/cves/2023/CVE-2023-30150.yaml
index 89dd0742b0..65ad42d33f 100644
--- a/http/cves/2023/CVE-2023-30150.yaml
+++ b/http/cves/2023/CVE-2023-30150.yaml
@@ -32,7 +32,7 @@ info:
     shodan-query:
       - http.component:"Prestashop"
       - http.component:"prestashop"
-  tags: time-based,cve2023,cve,prestashop,sqli,leotheme
+  tags: time-based-sqli,cve2023,cve,prestashop,sqli,leotheme
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-3077.yaml b/http/cves/2023/CVE-2023-3077.yaml
index 2ace47fb43..319eb0f9db 100644
--- a/http/cves/2023/CVE-2023-3077.yaml
+++ b/http/cves/2023/CVE-2023-3077.yaml
@@ -29,7 +29,7 @@ info:
     publicwww-query: "/wp-content/plugins/mstore-api/"
     shodan-query: http.html:/wp-content/plugins/mstore-api/
     fofa-query: body=/wp-content/plugins/mstore-api/
-  tags: time-based,cve,cve2023,wpscan,wordpress,wp-plugin,wp,mstore-api,sqli,inspireui
+  tags: time-based-sqli,cve,cve2023,wpscan,wordpress,wp-plugin,wp,mstore-api,sqli,inspireui
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2023/CVE-2023-34751.yaml b/http/cves/2023/CVE-2023-34751.yaml
index 1a8035c6bc..12289ca986 100644
--- a/http/cves/2023/CVE-2023-34751.yaml
+++ b/http/cves/2023/CVE-2023-34751.yaml
@@ -26,7 +26,7 @@ info:
     fofa-query:
       - "Powered by bloofoxCMS"
       - powered by bloofoxcms
-  tags: time-based,cve2023,cve,sqli,bloofox,authenticated
+  tags: time-based-sqli,cve2023,cve,sqli,bloofox,authenticated
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-34752.yaml b/http/cves/2023/CVE-2023-34752.yaml
index 5b043d0923..5139987619 100644
--- a/http/cves/2023/CVE-2023-34752.yaml
+++ b/http/cves/2023/CVE-2023-34752.yaml
@@ -28,7 +28,7 @@ info:
     fofa-query:
       - "Powered by bloofoxCMS"
       - powered by bloofoxcms
-  tags: time-based,cve,cve2023,sqli,bloofox,authenticated
+  tags: time-based-sqli,cve,cve2023,sqli,bloofox,authenticated
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-34753.yaml b/http/cves/2023/CVE-2023-34753.yaml
index 7f5f52b00a..54f2ec6c2b 100644
--- a/http/cves/2023/CVE-2023-34753.yaml
+++ b/http/cves/2023/CVE-2023-34753.yaml
@@ -26,7 +26,7 @@ info:
     fofa-query:
       - "Powered by bloofoxCMS"
       - powered by bloofoxcms
-  tags: time-based,cve,cve2023,sqli,bloofox,authenticated
+  tags: time-based-sqli,cve,cve2023,sqli,bloofox,authenticated
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-34754.yaml b/http/cves/2023/CVE-2023-34754.yaml
index 2c488596c8..b7788d7f3c 100644
--- a/http/cves/2023/CVE-2023-34754.yaml
+++ b/http/cves/2023/CVE-2023-34754.yaml
@@ -26,7 +26,7 @@ info:
     verified: true
     vendor: bloofox
     product: bloofoxcms
-  tags: time-based,cve,cve2023,bloofox,sqli,authenticated
+  tags: time-based-sqli,cve,cve2023,bloofox,sqli,authenticated
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-34755.yaml b/http/cves/2023/CVE-2023-34755.yaml
index 54d90265f6..001aa39287 100644
--- a/http/cves/2023/CVE-2023-34755.yaml
+++ b/http/cves/2023/CVE-2023-34755.yaml
@@ -26,7 +26,7 @@ info:
     fofa-query:
       - "Powered by bloofoxCMS"
       - powered by bloofoxcms
-  tags: time-based,cve,cve2023,sqli,bloofox,authenticated
+  tags: time-based-sqli,cve,cve2023,sqli,bloofox,authenticated
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-34756.yaml b/http/cves/2023/CVE-2023-34756.yaml
index 0a69d87c04..067c20a8ee 100644
--- a/http/cves/2023/CVE-2023-34756.yaml
+++ b/http/cves/2023/CVE-2023-34756.yaml
@@ -26,7 +26,7 @@ info:
     fofa-query:
       - "Powered by bloofoxCMS"
       - powered by bloofoxcms
-  tags: time-based,cve,cve2023,sqli,bloofox,authenticated
+  tags: time-based-sqli,cve,cve2023,sqli,bloofox,authenticated
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-36284.yaml b/http/cves/2023/CVE-2023-36284.yaml
index 9e55c66836..96116ee64f 100644
--- a/http/cves/2023/CVE-2023-36284.yaml
+++ b/http/cves/2023/CVE-2023-36284.yaml
@@ -29,7 +29,7 @@ info:
     fofa-query:
       - "title=\"QloApps\""
       - title="qloapps"
-  tags: time-based,cve,cve2023,qloapps,sqli,webkul
+  tags: time-based-sqli,cve,cve2023,qloapps,sqli,webkul
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2023/CVE-2023-39361.yaml b/http/cves/2023/CVE-2023-39361.yaml
index 6d2b4ecce7..8aab71fa9c 100644
--- a/http/cves/2023/CVE-2023-39361.yaml
+++ b/http/cves/2023/CVE-2023-39361.yaml
@@ -39,7 +39,7 @@ info:
     google-query:
       - intitle:"cacti"
       - intitle:"login to cacti"
-  tags: time-based,cve2023,cve,cacti,sqli
+  tags: time-based-sqli,cve2023,cve,cacti,sqli
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-39650.yaml b/http/cves/2023/CVE-2023-39650.yaml
index 610de931af..468ce07fc7 100644
--- a/http/cves/2023/CVE-2023-39650.yaml
+++ b/http/cves/2023/CVE-2023-39650.yaml
@@ -23,7 +23,7 @@ info:
     verified: true
     framework: prestashop
     shodan-query: html:"/tvcmsblog"
-  tags: time-based,cve,cve2023,prestashop,sqli,tvcmsblog
+  tags: time-based-sqli,cve,cve2023,prestashop,sqli,tvcmsblog
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-39796.yaml b/http/cves/2023/CVE-2023-39796.yaml
index 9cc3f5b905..f3f50a6186 100644
--- a/http/cves/2023/CVE-2023-39796.yaml
+++ b/http/cves/2023/CVE-2023-39796.yaml
@@ -24,7 +24,7 @@ info:
     max-request: 1
     vendor: wbce
     product: wbce_cms
-  tags: time-based,cve,cve2023,sqli,wbce,intrusive
+  tags: time-based-sqli,cve,cve2023,sqli,wbce,intrusive
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-43374.yaml b/http/cves/2023/CVE-2023-43374.yaml
index b9df11b85e..aa8fc1c581 100644
--- a/http/cves/2023/CVE-2023-43374.yaml
+++ b/http/cves/2023/CVE-2023-43374.yaml
@@ -34,7 +34,7 @@ info:
       - title="hoteldruid"
       - icon_hash=-1521640213
     google-query: intitle:"hoteldruid"
-  tags: time-based,cve,cve2023,hoteldruid,cms,sqli,digitaldruid
+  tags: time-based-sqli,cve,cve2023,hoteldruid,cms,sqli,digitaldruid
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2023/CVE-2023-45375.yaml b/http/cves/2023/CVE-2023-45375.yaml
index 3367d97fc7..9d55188a7d 100644
--- a/http/cves/2023/CVE-2023-45375.yaml
+++ b/http/cves/2023/CVE-2023-45375.yaml
@@ -23,7 +23,7 @@ info:
     product: pireospay
     framework: prestashop
     shodan-query: "http.component:\"prestashop\""
-  tags: time-based,cve,cve2023,sqli,prestashop,pireospay,01generator
+  tags: time-based-sqli,cve,cve2023,sqli,prestashop,pireospay,01generator
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2023/CVE-2023-46347.yaml b/http/cves/2023/CVE-2023-46347.yaml
index b4b51bdd3d..a414583b38 100644
--- a/http/cves/2023/CVE-2023-46347.yaml
+++ b/http/cves/2023/CVE-2023-46347.yaml
@@ -24,7 +24,7 @@ info:
     product: ndk_steppingpack
     framework: prestashop
     shodan-query: http.component:"prestashop"
-  tags: time-based,cve,cve2023,sqli,prestashop,ndk_steppingpack,ndkdesign
+  tags: time-based-sqli,cve,cve2023,sqli,prestashop,ndk_steppingpack,ndkdesign
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-48084.yaml b/http/cves/2023/CVE-2023-48084.yaml
index 2e8fe811a6..40b2d4ac48 100644
--- a/http/cves/2023/CVE-2023-48084.yaml
+++ b/http/cves/2023/CVE-2023-48084.yaml
@@ -34,7 +34,7 @@ info:
       - title="nagios xi"
       - app="nagios-xi"
     google-query: intitle:"nagios xi"
-  tags: time-based,cve,cve2023,nagiosxi,sqli,authenticated,nagios
+  tags: time-based-sqli,cve,cve2023,nagiosxi,sqli,authenticated,nagios
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-4974.yaml b/http/cves/2023/CVE-2023-4974.yaml
index 69867467fb..cdd8e1af55 100644
--- a/http/cves/2023/CVE-2023-4974.yaml
+++ b/http/cves/2023/CVE-2023-4974.yaml
@@ -29,7 +29,7 @@ info:
       - html:"Academy LMS"
       - http.html:"academy lms"
     fofa-query: body="academy lms"
-  tags: time-based,cve,cve2023,packetstorm,sqli,academy,lms,creativeitem
+  tags: time-based-sqli,cve,cve2023,packetstorm,sqli,academy,lms,creativeitem
 
 http:
   - raw:
diff --git a/http/cves/2023/CVE-2023-6063.yaml b/http/cves/2023/CVE-2023-6063.yaml
index 95777bc871..209ca6b00d 100644
--- a/http/cves/2023/CVE-2023-6063.yaml
+++ b/http/cves/2023/CVE-2023-6063.yaml
@@ -29,7 +29,7 @@ info:
     shodan-query: "http.html:/wp-content/plugins/wp-fastest-cache/"
     fofa-query: "body=/wp-content/plugins/wp-fastest-cache/"
     publicwww-query: "/wp-content/plugins/wp-fastest-cache/"
-  tags: time-based,cve,cve2023,wp-fastest-cache,wpscan,wordpress,wp-plugin,sqli,wpfastestcache
+  tags: time-based-sqli,cve,cve2023,wp-fastest-cache,wpscan,wordpress,wp-plugin,sqli,wpfastestcache
 flow: |
     if (http(1)) {
         for (let i = 0; i < 2; i++) {
diff --git a/http/cves/2023/CVE-2023-6567.yaml b/http/cves/2023/CVE-2023-6567.yaml
index cad1da1aa3..cae140f0a7 100644
--- a/http/cves/2023/CVE-2023-6567.yaml
+++ b/http/cves/2023/CVE-2023-6567.yaml
@@ -30,7 +30,7 @@ info:
     shodan-query: http.html:/wp-content/plugins/learnpress
     fofa-query: body=/wp-content/plugins/learnpress
     publicwww-query: "/wp-content/plugins/learnpress"
-  tags: time-based,wpscan,cve,cve2023,wp,wp-plugin,wordpress,learnpress,sqli,thimpress
+  tags: time-based-sqli,wpscan,cve,cve2023,wp,wp-plugin,wordpress,learnpress,sqli,thimpress
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-1061.yaml b/http/cves/2024/CVE-2024-1061.yaml
index 9cf3c01a58..43aeda4f81 100644
--- a/http/cves/2024/CVE-2024-1061.yaml
+++ b/http/cves/2024/CVE-2024-1061.yaml
@@ -31,7 +31,7 @@ info:
     product: html5_video_player
     framework: wordpress
     fofa-query: "\"wordpress\" && body=\"html5-video-player\""
-  tags: time-based,cve,cve2024,wp,wordpress,wp-plugin,sqli,html5-video-player,bplugins
+  tags: time-based-sqli,cve,cve2024,wp,wordpress,wp-plugin,sqli,html5-video-player,bplugins
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-1071.yaml b/http/cves/2024/CVE-2024-1071.yaml
index d28c323a36..d72035437a 100644
--- a/http/cves/2024/CVE-2024-1071.yaml
+++ b/http/cves/2024/CVE-2024-1071.yaml
@@ -30,7 +30,7 @@ info:
     zoomeye-query: app:"WordPress Ultimate Member Plugin"
     product: ultimate_member
     vendor: ultimatemember
-  tags: time-based,cve,cve2024,ultimate-member,wpscan,wordpress,wp-plugin,sqli
+  tags: time-based-sqli,cve,cve2024,ultimate-member,wpscan,wordpress,wp-plugin,sqli
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-1512.yaml b/http/cves/2024/CVE-2024-1512.yaml
index c0e1bc3e9c..15a9c7b4e9 100644
--- a/http/cves/2024/CVE-2024-1512.yaml
+++ b/http/cves/2024/CVE-2024-1512.yaml
@@ -25,7 +25,7 @@ info:
     product: masterstudy_lms
     framework: wordpress
     fofa-query: body="wp-content/plugins/masterstudy-lms-learning-management-system/"
-  tags: time-based,cve,cve2024,sqli,wp-plugin,wordpress
+  tags: time-based-sqli,cve,cve2024,sqli,wp-plugin,wordpress
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-1698.yaml b/http/cves/2024/CVE-2024-1698.yaml
index 2086b636e4..283322f02d 100644
--- a/http/cves/2024/CVE-2024-1698.yaml
+++ b/http/cves/2024/CVE-2024-1698.yaml
@@ -25,7 +25,7 @@ info:
     fofa-query: body="/wp-content/plugins/notificationx"
     product: notificationx
     vendor: wpdeveloper
-  tags: time-based,cve,cve2024,wpscan,wordpress,wp-plugin,notificationx,sqli
+  tags: time-based-sqli,cve,cve2024,wpscan,wordpress,wp-plugin,notificationx,sqli
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-2621.yaml b/http/cves/2024/CVE-2024-2621.yaml
index 821bd10030..cee935f338 100644
--- a/http/cves/2024/CVE-2024-2621.yaml
+++ b/http/cves/2024/CVE-2024-2621.yaml
@@ -24,7 +24,7 @@ info:
     verified: true
     max-request: 1
     fofa-query: body="app/structure/departments.php" || app="指挥调度管理平台"
-  tags: time-based,cve,cve2024,sqli,fujian,rce
+  tags: time-based-sqli,cve,cve2024,sqli,fujian,rce
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-27956.yaml b/http/cves/2024/CVE-2024-27956.yaml
index 090e13fced..58bc409142 100644
--- a/http/cves/2024/CVE-2024-27956.yaml
+++ b/http/cves/2024/CVE-2024-27956.yaml
@@ -25,7 +25,7 @@ info:
     verified: true
     max-request: 1
     publicwww-query: "wp-content/plugins/wp-automatic"
-  tags: time-based,cve,cve2024,sqli,wordpress,wpscan,wp-automatic
+  tags: time-based-sqli,cve,cve2024,sqli,wordpress,wpscan,wp-automatic
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-2876.yaml b/http/cves/2024/CVE-2024-2876.yaml
index ad04da61ec..6153ca2d40 100644
--- a/http/cves/2024/CVE-2024-2876.yaml
+++ b/http/cves/2024/CVE-2024-2876.yaml
@@ -13,7 +13,7 @@ info:
     verified: true
     max-request: 1
     publicwww-query: "/wp-content/plugins/email-subscribers/"
-  tags: time-based,cve,cve2024,wp,wordpress,wp-plugin,sqli,email-subscribers,wpscan
+  tags: time-based-sqli,cve,cve2024,wp,wordpress,wp-plugin,sqli,email-subscribers,wpscan
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-2879.yaml b/http/cves/2024/CVE-2024-2879.yaml
index 703662cf31..31f48e7417 100644
--- a/http/cves/2024/CVE-2024-2879.yaml
+++ b/http/cves/2024/CVE-2024-2879.yaml
@@ -28,7 +28,7 @@ info:
     product: layerslider
     framework: wordpress
     publicwww-query: "/wp-content/plugins/LayerSlider/"
-  tags: time-based,cve,cve2024,wp-plugin,wp,wordpress,layerslider,sqli
+  tags: time-based-sqli,cve,cve2024,wp-plugin,wp,wordpress,layerslider,sqli
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2024/CVE-2024-3552.yaml b/http/cves/2024/CVE-2024-3552.yaml
index fd3ae7d78e..7824bbb7fe 100644
--- a/http/cves/2024/CVE-2024-3552.yaml
+++ b/http/cves/2024/CVE-2024-3552.yaml
@@ -18,7 +18,7 @@ info:
     vendor: salephpscripts
     product: web_directory_free
     publicwww-query: "/wp-content/plugins/web-directory-free"
-  tags: time-based,cve,cve2024,wordpress,wp-plugin,wpscan,wp,web-directory-free
+  tags: time-based-sqli,cve,cve2024,wordpress,wp-plugin,wpscan,wp,web-directory-free
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2024/CVE-2024-36412.yaml b/http/cves/2024/CVE-2024-36412.yaml
index 06f6a29c25..1419cb8d8d 100644
--- a/http/cves/2024/CVE-2024-36412.yaml
+++ b/http/cves/2024/CVE-2024-36412.yaml
@@ -24,7 +24,7 @@ info:
     product: suitecrm
     shodan-query: title:"SuiteCRM"
     fofa-query: title="SuiteCRM"
-  tags: time-based,cve,cve2024,suitecrm,sqli
+  tags: time-based-sqli,cve,cve2024,suitecrm,sqli
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-36683.yaml b/http/cves/2024/CVE-2024-36683.yaml
index 95428a3246..3b94eb0998 100644
--- a/http/cves/2024/CVE-2024-36683.yaml
+++ b/http/cves/2024/CVE-2024-36683.yaml
@@ -24,7 +24,7 @@ info:
     framework: prestashop
     shodan-query: html:"/productsalert"
     fofa-query: body="/productsalert"
-  tags: time-based,cve,cve2023,prestashop,sqli,productsalert
+  tags: time-based-sqli,cve,cve2023,prestashop,sqli,productsalert
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-3922.yaml b/http/cves/2024/CVE-2024-3922.yaml
index 07147e2f37..26dcb39b23 100644
--- a/http/cves/2024/CVE-2024-3922.yaml
+++ b/http/cves/2024/CVE-2024-3922.yaml
@@ -21,7 +21,7 @@ info:
     vendor: wedevs
     product: dokan
     publicwww-query: "/wp-content/plugins/dokan-pro/"
-  tags: time-based,cve,cve2024,dokan,wp-plugin,wordpress,wp,dokan-pro,sqli
+  tags: time-based-sqli,cve,cve2024,dokan,wp-plugin,wordpress,wp,dokan-pro,sqli
 flow: http(1) && http(2)
 
 http:
diff --git a/http/cves/2024/CVE-2024-4257.yaml b/http/cves/2024/CVE-2024-4257.yaml
index 0c090fb037..54208f2f67 100644
--- a/http/cves/2024/CVE-2024-4257.yaml
+++ b/http/cves/2024/CVE-2024-4257.yaml
@@ -21,7 +21,7 @@ info:
     verified: true
     max-request: 1
     fofa-query: app="LANWON-临床浏览系统"
-  tags: time-based,cve,cve2024,sqli,blunet
+  tags: time-based-sqli,cve,cve2024,sqli,blunet
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-4295.yaml b/http/cves/2024/CVE-2024-4295.yaml
index 5db439ab70..f8200580cc 100644
--- a/http/cves/2024/CVE-2024-4295.yaml
+++ b/http/cves/2024/CVE-2024-4295.yaml
@@ -29,7 +29,7 @@ info:
     max-request: 1
     publicwww-query: "/wp-content/plugins/email-subscribers/"
     fofa-query: body="/wp-content/plugins/email-subscribers/"
-  tags: time-based,cve,cve2024,wordpress,wp-plugin,wp,email-subscribers,sqli
+  tags: time-based-sqli,cve,cve2024,wordpress,wp-plugin,wp,email-subscribers,sqli
 
 variables:
   contact_id: "{{contact_id}}"
diff --git a/http/cves/2024/CVE-2024-43917.yaml b/http/cves/2024/CVE-2024-43917.yaml
index 3a93f0fde4..2ee7aa827b 100644
--- a/http/cves/2024/CVE-2024-43917.yaml
+++ b/http/cves/2024/CVE-2024-43917.yaml
@@ -26,7 +26,7 @@ info:
     framework: wordpress
     fofa-query: body="/wp-content/plugins/ti-woocommerce-wishlist/"
     publicwww-query: "/wp-content/plugins/ti-woocommerce-wishlist/"
-  tags: time-based,cve,cve2024,wp,wordpress,ti-woocommerce-wishlist,wp-plugin,sqli
+  tags: time-based-sqli,cve,cve2024,wp,wordpress,ti-woocommerce-wishlist,wp-plugin,sqli
 
 flow: http(1) && http(2) && http(3) && http(4)
 
diff --git a/http/cves/2024/CVE-2024-4443.yaml b/http/cves/2024/CVE-2024-4443.yaml
index 13b63b1f36..fbae0489b0 100644
--- a/http/cves/2024/CVE-2024-4443.yaml
+++ b/http/cves/2024/CVE-2024-4443.yaml
@@ -28,7 +28,7 @@ info:
     publicwww-query: "/wp-content/plugins/business-directory-plugin/"
     product: business_directory
     vendor: businessdirectoryplugin
-  tags: time-based,cve,cve2024,sqli,business-directory,wordpress,wp-plugin
+  tags: time-based-sqli,cve,cve2024,sqli,business-directory,wordpress,wp-plugin
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-5765.yaml b/http/cves/2024/CVE-2024-5765.yaml
index 3f439e1897..cf38d26cea 100644
--- a/http/cves/2024/CVE-2024-5765.yaml
+++ b/http/cves/2024/CVE-2024-5765.yaml
@@ -17,7 +17,7 @@ info:
     max-request: 2
     verified: true
     fofa-query: body="/plugins/wpstickybar-sticky-bar-sticky-header"
-  tags: time-based,cve,cve2024,sqli,wpscan,wordpress,wp-plugin,wp,wpstickybar,unauth
+  tags: time-based-sqli,cve,cve2024,sqli,wpscan,wordpress,wp-plugin,wp,wpstickybar,unauth
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-5975.yaml b/http/cves/2024/CVE-2024-5975.yaml
index 311e8778cc..93c3a4c06a 100644
--- a/http/cves/2024/CVE-2024-5975.yaml
+++ b/http/cves/2024/CVE-2024-5975.yaml
@@ -21,7 +21,7 @@ info:
     product: cz-loan-management
     framework: wordpress
     publicwww-query: "/wp-content/plugins/cz-loan-management"
-  tags: time-based,cve,cve2024,wpscan,wp-plugin,wordpress,wp,cz-loan-management
+  tags: time-based-sqli,cve,cve2024,wpscan,wp-plugin,wordpress,wp,cz-loan-management
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-6028.yaml b/http/cves/2024/CVE-2024-6028.yaml
index 2af99dc66f..8a1b1055fb 100644
--- a/http/cves/2024/CVE-2024-6028.yaml
+++ b/http/cves/2024/CVE-2024-6028.yaml
@@ -22,7 +22,7 @@ info:
     publicwww-query: "/wp-content/plugins/quiz-maker/"
     product: quiz_maker
     vendor: ays-pro
-  tags: time-based,cve,cve2024,wordpress,wp,wp-plugin,quiz-maker,sqli
+  tags: time-based-sqli,cve,cve2024,wordpress,wp,wp-plugin,quiz-maker,sqli
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-6159.yaml b/http/cves/2024/CVE-2024-6159.yaml
index 5b8425ef2b..44722e039e 100644
--- a/http/cves/2024/CVE-2024-6159.yaml
+++ b/http/cves/2024/CVE-2024-6159.yaml
@@ -18,7 +18,7 @@ info:
     max-request: 2
     framework: wordpress
     publicwww-query: "/wp-content/plugins/push-notification-for-post-and-buddypress"
-  tags: time-based,cve,cve2024,wpscan,wp-plugin,wordpress,push-notification
+  tags: time-based-sqli,cve,cve2024,wpscan,wp-plugin,wordpress,push-notification
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-6205.yaml b/http/cves/2024/CVE-2024-6205.yaml
index 4052d6731a..cc14fb612e 100644
--- a/http/cves/2024/CVE-2024-6205.yaml
+++ b/http/cves/2024/CVE-2024-6205.yaml
@@ -24,7 +24,7 @@ info:
     product: payplus-payment-gateway
     framework: wordpress
     publicwww-query: "/wp-content/plugins/payplus-payment-gateway"
-  tags: time-based,wpscan,cve,cve2024,sqli,wordpress,wp-plugin,wp,payplus-payment
+  tags: time-based-sqli,wpscan,cve,cve2024,sqli,wordpress,wp-plugin,wp,payplus-payment
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-6924.yaml b/http/cves/2024/CVE-2024-6924.yaml
index aa0b72e06b..dcb6edba1e 100644
--- a/http/cves/2024/CVE-2024-6924.yaml
+++ b/http/cves/2024/CVE-2024-6924.yaml
@@ -14,7 +14,7 @@ info:
     product: truebooker
     framework: wordpress
     publicwww-query: "/wp-content/plugins/truebooker-appointment-booking"
-  tags: time-based,wpscan,cve,cve2024,sqli,wp,wp-plugin,wordpress,truebooker
+  tags: time-based-sqli,wpscan,cve,cve2024,sqli,wp,wp-plugin,wordpress,truebooker
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-6926.yaml b/http/cves/2024/CVE-2024-6926.yaml
index dfda870be4..aa3237bc2e 100644
--- a/http/cves/2024/CVE-2024-6926.yaml
+++ b/http/cves/2024/CVE-2024-6926.yaml
@@ -21,7 +21,7 @@ info:
     product: viral-signup
     framework: wordpress
     publicwww-query: "/wp-content/plugins/viral-signup"
-  tags: time-based,cve,cve2024,wpscan,wp-plugin,wordpress,viral-signup
+  tags: time-based-sqli,cve,cve2024,wpscan,wp-plugin,wordpress,viral-signup
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-6928.yaml b/http/cves/2024/CVE-2024-6928.yaml
index c05729ebcd..fe97f0d272 100644
--- a/http/cves/2024/CVE-2024-6928.yaml
+++ b/http/cves/2024/CVE-2024-6928.yaml
@@ -20,7 +20,7 @@ info:
     product: opti-marketing
     framework: wordpress
     publicwww-query: "/wp-content/plugins/opti-marketing"
-  tags: time-based,cve,cve2024,wpscan,wp-plugin,wp,wordpress,opti-marketing,sqli
+  tags: time-based-sqli,cve,cve2024,wpscan,wp-plugin,wp,wordpress,opti-marketing,sqli
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-7188.yaml b/http/cves/2024/CVE-2024-7188.yaml
index e0b0e1a8a1..5c9c81ae96 100644
--- a/http/cves/2024/CVE-2024-7188.yaml
+++ b/http/cves/2024/CVE-2024-7188.yaml
@@ -25,7 +25,7 @@ info:
     product: quicklancer
     shodan-query: http.favicon.hash:1099370896
     fofa-query: icon_hash="1099370896"
-  tags: time-based,cve,cve2024,sqli,quicklancer
+  tags: time-based-sqli,cve,cve2024,sqli,quicklancer
 
 http:
   - raw:
diff --git a/http/cves/2024/CVE-2024-7854.yaml b/http/cves/2024/CVE-2024-7854.yaml
index 726b654049..9faa5be6c1 100644
--- a/http/cves/2024/CVE-2024-7854.yaml
+++ b/http/cves/2024/CVE-2024-7854.yaml
@@ -25,7 +25,7 @@ info:
     product: woo_inquiry
     framework: wordpress
     publicwww-query: "/wp-content/plugins/woo-inquiry"
-  tags: time-based,cve,cve2024,wp,wordpress,wp-plugin,sqli,woo-inquiry
+  tags: time-based-sqli,cve,cve2024,wp,wordpress,wp-plugin,sqli,woo-inquiry
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-8484.yaml b/http/cves/2024/CVE-2024-8484.yaml
index e171eb8cab..9af62b8805 100644
--- a/http/cves/2024/CVE-2024-8484.yaml
+++ b/http/cves/2024/CVE-2024-8484.yaml
@@ -26,7 +26,7 @@ info:
     product: rest-api-to-miniprogram
     framework: wordpress
     publicwww-query: "/wp-content/plugins/rest-api-to-miniprogram"
-  tags: time-based,cve,cve2024,wp,wp-plugin,wordpress,sqli,miniprogram
+  tags: time-based-sqli,cve,cve2024,wp,wp-plugin,wordpress,sqli,miniprogram
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-8503.yaml b/http/cves/2024/CVE-2024-8503.yaml
index fdb6fd5d19..94b77a77a2 100644
--- a/http/cves/2024/CVE-2024-8503.yaml
+++ b/http/cves/2024/CVE-2024-8503.yaml
@@ -23,7 +23,7 @@ info:
     vendor: vicidial
     product: vicidial
     fofa-query: icon_hash="1375401192"
-  tags: time-based,cve,cve2024,vicidial,sqli
+  tags: time-based-sqli,cve,cve2024,vicidial,sqli
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-8522.yaml b/http/cves/2024/CVE-2024-8522.yaml
index 33fd461494..beec41976a 100644
--- a/http/cves/2024/CVE-2024-8522.yaml
+++ b/http/cves/2024/CVE-2024-8522.yaml
@@ -25,7 +25,7 @@ info:
     product: learnpress
     shodan-query: html:"/wp-content/plugins/learnpress"
     fofa-query: body="/wp-content/plugins/learnpress"
-  tags: time-based,cve,cve2024,learnpress,sqli,wp,wordpress,wp-plugin,authenticated
+  tags: time-based-sqli,cve,cve2024,learnpress,sqli,wp,wordpress,wp-plugin,authenticated
 
 flow: http(1) && http(2)
 
diff --git a/http/cves/2024/CVE-2024-9465.yaml b/http/cves/2024/CVE-2024-9465.yaml
index b79fa60746..bd99075ec5 100644
--- a/http/cves/2024/CVE-2024-9465.yaml
+++ b/http/cves/2024/CVE-2024-9465.yaml
@@ -24,7 +24,7 @@ info:
     vendor: paloaltonetworks
     product: expedition
     shodan-query: http.favicon.hash:1499876150
-  tags: time-based,cve,cve2024,palo-alto,sqli
+  tags: time-based-sqli,cve,cve2024,palo-alto,sqli
 
 flow: http(1) && http(2)
 
diff --git a/http/vulnerabilities/hjsoft/hjsoft-hcm-tb-sqli.yaml b/http/vulnerabilities/hjsoft/hjsoft-hcm-tb-sqli.yaml
index 58477c1d9c..43f7cc40c7 100644
--- a/http/vulnerabilities/hjsoft/hjsoft-hcm-tb-sqli.yaml
+++ b/http/vulnerabilities/hjsoft/hjsoft-hcm-tb-sqli.yaml
@@ -12,7 +12,7 @@ info:
     verified: true
     max-request: 1
     fofa-query: app="HJSOFT-HCM"
-  tags: time-based,sqli,hjsoft,management-system
+  tags: time-based-sqli,sqli,hjsoft,management-system
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/applezeed-sqli.yaml b/http/vulnerabilities/other/applezeed-sqli.yaml
index 10fd9cebea..b732eaf3ef 100644
--- a/http/vulnerabilities/other/applezeed-sqli.yaml
+++ b/http/vulnerabilities/other/applezeed-sqli.yaml
@@ -12,7 +12,7 @@ info:
     verified: true
     max-request: 1
     google-query: intext:"Power BY applezeed.com"
-  tags: time-based,sqli,unauth,applezeed
+  tags: time-based-sqli,sqli,unauth,applezeed
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/azon-dominator-sqli.yaml b/http/vulnerabilities/other/azon-dominator-sqli.yaml
index 4fc7ff9c8f..11514f7226 100644
--- a/http/vulnerabilities/other/azon-dominator-sqli.yaml
+++ b/http/vulnerabilities/other/azon-dominator-sqli.yaml
@@ -13,7 +13,7 @@ info:
     verified: true
     max-request: 1
     fofa-query: "Azon Dominator"
-  tags: time-based,azon,dominator,sqli
+  tags: time-based-sqli,azon,dominator,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/csz-cms-sqli.yaml b/http/vulnerabilities/other/csz-cms-sqli.yaml
index 94f40c647b..ae15e05f88 100644
--- a/http/vulnerabilities/other/csz-cms-sqli.yaml
+++ b/http/vulnerabilities/other/csz-cms-sqli.yaml
@@ -11,7 +11,7 @@ info:
   metadata:
     verified: true
     max-request: 1
-  tags: time-based,packetstorm,sqli,csz,cms
+  tags: time-based-sqli,packetstorm,sqli,csz,cms
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/ecology-oa-file-sqli.yaml b/http/vulnerabilities/other/ecology-oa-file-sqli.yaml
index 8b53637888..06daa6d1ab 100644
--- a/http/vulnerabilities/other/ecology-oa-file-sqli.yaml
+++ b/http/vulnerabilities/other/ecology-oa-file-sqli.yaml
@@ -17,7 +17,7 @@ info:
     product: e-cology
     shodan-query: ecology_JSessionid
     fofa-query: app="泛微-协同办公OA"
-  tags: time-based,ecology,ecology-oa,sqli
+  tags: time-based-sqli,ecology,ecology-oa,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/fumengyun-sqli.yaml b/http/vulnerabilities/other/fumengyun-sqli.yaml
index b24eccbfd3..f315f230f9 100644
--- a/http/vulnerabilities/other/fumengyun-sqli.yaml
+++ b/http/vulnerabilities/other/fumengyun-sqli.yaml
@@ -22,7 +22,7 @@ info:
     max-request: 1
     shodan-query: title:"孚盟云 "
     fofa-query: title="孚盟云 "
-  tags: time-based,fumasoft,sqli
+  tags: time-based-sqli,fumasoft,sqli
 
 flow: http(1) && http(2)
 
diff --git a/http/vulnerabilities/other/groomify-sqli.yaml b/http/vulnerabilities/other/groomify-sqli.yaml
index 3362474f32..2f40e133cd 100644
--- a/http/vulnerabilities/other/groomify-sqli.yaml
+++ b/http/vulnerabilities/other/groomify-sqli.yaml
@@ -12,7 +12,7 @@ info:
   metadata:
     verified: "true"
     max-request: 1
-  tags: time-based,sqli,groomify,unauth
+  tags: time-based-sqli,sqli,groomify,unauth
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/opencart-core-sqli.yaml b/http/vulnerabilities/other/opencart-core-sqli.yaml
index d86ec91230..97e969feb0 100644
--- a/http/vulnerabilities/other/opencart-core-sqli.yaml
+++ b/http/vulnerabilities/other/opencart-core-sqli.yaml
@@ -17,7 +17,7 @@ info:
     fofa-query: icon_hash="-1443008128"
     product: opencart
     vendor: opencart
-  tags: time-based,opencart,sqli
+  tags: time-based-sqli,opencart,sqli
 flow: http(1) && http(2)
 
 http:
diff --git a/http/vulnerabilities/other/pingsheng-electronic-sqli.yaml b/http/vulnerabilities/other/pingsheng-electronic-sqli.yaml
index 72ff9c11dd..ac64f7a448 100644
--- a/http/vulnerabilities/other/pingsheng-electronic-sqli.yaml
+++ b/http/vulnerabilities/other/pingsheng-electronic-sqli.yaml
@@ -13,7 +13,7 @@ info:
     verified: "true"
     max-request: 1
     fofa-query: "js/PSExtend.js"
-  tags: time-based,sqli,pingsheng
+  tags: time-based-sqli,sqli,pingsheng
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/pmb-sqli.yaml b/http/vulnerabilities/other/pmb-sqli.yaml
index 3100008247..f5613c221d 100644
--- a/http/vulnerabilities/other/pmb-sqli.yaml
+++ b/http/vulnerabilities/other/pmb-sqli.yaml
@@ -13,7 +13,7 @@ info:
     verified: true
     max-request: 1
     google-query: inurl:"opac_css"
-  tags: time-based,sqli,unauth,pmb
+  tags: time-based-sqli,sqli,unauth,pmb
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/readymade-unilevel-sqli.yaml b/http/vulnerabilities/other/readymade-unilevel-sqli.yaml
index 9bd17cd4c7..a700d33af5 100644
--- a/http/vulnerabilities/other/readymade-unilevel-sqli.yaml
+++ b/http/vulnerabilities/other/readymade-unilevel-sqli.yaml
@@ -11,7 +11,7 @@ info:
   metadata:
     vendor: i-netsolution
     product: readymade-unilevel-ecommerce
-  tags: time-based,ecommerce,readymade,sqli
+  tags: time-based-sqli,ecommerce,readymade,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/sitemap-sql-injection.yaml b/http/vulnerabilities/other/sitemap-sql-injection.yaml
index cbf2f3dd36..9acdf3a3e0 100644
--- a/http/vulnerabilities/other/sitemap-sql-injection.yaml
+++ b/http/vulnerabilities/other/sitemap-sql-injection.yaml
@@ -9,7 +9,7 @@ info:
   metadata:
     max-request: 2
     google-query: intext:"sitemap" filetype:txt, filetype:xml inurl:sitemap
-  tags: time-based,misconfig,sitemap,sqli
+  tags: time-based-sqli,misconfig,sitemap,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/other/stackposts-sqli.yaml b/http/vulnerabilities/other/stackposts-sqli.yaml
index 3f7fcf2def..c0a8300171 100644
--- a/http/vulnerabilities/other/stackposts-sqli.yaml
+++ b/http/vulnerabilities/other/stackposts-sqli.yaml
@@ -14,7 +14,7 @@ info:
     verified: true
     max-request: 1
     shodan-query: html:"stackposts"
-  tags: time-based,sqli,unauth,stackposts
+  tags: time-based-sqli,sqli,unauth,stackposts
 
 http:
   - raw:
diff --git a/http/vulnerabilities/prestashop/prestashop-apmarketplace-sqli.yaml b/http/vulnerabilities/prestashop/prestashop-apmarketplace-sqli.yaml
index 15117013b6..3e451477b3 100644
--- a/http/vulnerabilities/prestashop/prestashop-apmarketplace-sqli.yaml
+++ b/http/vulnerabilities/prestashop/prestashop-apmarketplace-sqli.yaml
@@ -11,7 +11,7 @@ info:
   metadata:
     verified: true
     shodan-query: http.component:"Prestashop"
-  tags: time-based,prestashop,sqli
+  tags: time-based-sqli,prestashop,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/vbulletin/vbulletin-ajaxreg-sqli.yaml b/http/vulnerabilities/vbulletin/vbulletin-ajaxreg-sqli.yaml
index fb8bdcfe59..34103029a1 100644
--- a/http/vulnerabilities/vbulletin/vbulletin-ajaxreg-sqli.yaml
+++ b/http/vulnerabilities/vbulletin/vbulletin-ajaxreg-sqli.yaml
@@ -19,7 +19,7 @@ info:
     shodan-query: http.component:"vBulletin"
     product: vbulletin
     vendor: vbulletin
-  tags: time-based,packetstorm,vbulletin,ajaxreg,sqli
+  tags: time-based-sqli,packetstorm,vbulletin,ajaxreg,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wanhu/wanhu-documentedit-sqli.yaml b/http/vulnerabilities/wanhu/wanhu-documentedit-sqli.yaml
index b55d308b79..39482bba97 100755
--- a/http/vulnerabilities/wanhu/wanhu-documentedit-sqli.yaml
+++ b/http/vulnerabilities/wanhu/wanhu-documentedit-sqli.yaml
@@ -13,7 +13,7 @@ info:
     verified: true
     max-request: 1
     fofa-query: app="万户网络-ezOFFICE"
-  tags: time-based,wanhu,sqli
+  tags: time-based-sqli,wanhu,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wordpress/advanced-booking-calendar-sqli.yaml b/http/vulnerabilities/wordpress/advanced-booking-calendar-sqli.yaml
index 53910072bf..1fff1f5c47 100644
--- a/http/vulnerabilities/wordpress/advanced-booking-calendar-sqli.yaml
+++ b/http/vulnerabilities/wordpress/advanced-booking-calendar-sqli.yaml
@@ -13,7 +13,7 @@ info:
   metadata:
     verified: true
     max-request: 1
-  tags: time-based,sqli,wpscan,wordpress,wp-plugin,wp,advanced-booking-calendar,unauthenticated
+  tags: time-based-sqli,sqli,wpscan,wordpress,wp-plugin,wp,advanced-booking-calendar,unauthenticated
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wordpress/leaguemanager-sql-injection.yaml b/http/vulnerabilities/wordpress/leaguemanager-sql-injection.yaml
index 7a7f7525cf..c8a5273022 100644
--- a/http/vulnerabilities/wordpress/leaguemanager-sql-injection.yaml
+++ b/http/vulnerabilities/wordpress/leaguemanager-sql-injection.yaml
@@ -12,7 +12,7 @@ info:
   metadata:
     verified: true
     max-request: 1
-  tags: time-based,wpscan,sqli,wp,wp-plugin,wordpress,leaguemanager,unauth
+  tags: time-based-sqli,wpscan,sqli,wp,wp-plugin,wordpress,leaguemanager,unauth
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wordpress/notificationx-sqli.yaml b/http/vulnerabilities/wordpress/notificationx-sqli.yaml
index e8604e4d27..98cfae5184 100644
--- a/http/vulnerabilities/wordpress/notificationx-sqli.yaml
+++ b/http/vulnerabilities/wordpress/notificationx-sqli.yaml
@@ -13,7 +13,7 @@ info:
   metadata:
     verified: true
     max-request: 2
-  tags: time-based,wpscan,sqli,wp,wp-plugin,wordpress,notificationx-sql-injection
+  tags: time-based-sqli,wpscan,sqli,wp,wp-plugin,wordpress,notificationx-sql-injection
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wordpress/wp-adivaha-sqli.yaml b/http/vulnerabilities/wordpress/wp-adivaha-sqli.yaml
index 713d2a8c56..23293d2f59 100644
--- a/http/vulnerabilities/wordpress/wp-adivaha-sqli.yaml
+++ b/http/vulnerabilities/wordpress/wp-adivaha-sqli.yaml
@@ -12,7 +12,7 @@ info:
     verified: true
     max-request: 1
     publicwww-query: "/wp-content/plugins/adiaha-hotel/"
-  tags: time-based,sqli,adivaha,wordpress,wp,wp-plugin
+  tags: time-based-sqli,sqli,adivaha,wordpress,wp,wp-plugin
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wordpress/wp-autosuggest-sql-injection.yaml b/http/vulnerabilities/wordpress/wp-autosuggest-sql-injection.yaml
index 685f6699ee..875ea3b429 100644
--- a/http/vulnerabilities/wordpress/wp-autosuggest-sql-injection.yaml
+++ b/http/vulnerabilities/wordpress/wp-autosuggest-sql-injection.yaml
@@ -12,7 +12,7 @@ info:
   metadata:
     verified: true
     max-request: 1
-  tags: time-based,wp-plugin,wp,wp-autosuggest,wpscan,sqli,wordpress
+  tags: time-based-sqli,wp-plugin,wp,wp-autosuggest,wpscan,sqli,wordpress
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wordpress/wp-smart-manager-sqli.yaml b/http/vulnerabilities/wordpress/wp-smart-manager-sqli.yaml
index 4d47ef1ff9..d2a1475098 100644
--- a/http/vulnerabilities/wordpress/wp-smart-manager-sqli.yaml
+++ b/http/vulnerabilities/wordpress/wp-smart-manager-sqli.yaml
@@ -15,7 +15,7 @@ info:
     verified: true
     max-request: 2
     publicwww-query: "/wp-content/plugins/smart-manager-for-wp-e-commerce/"
-  tags: time-based,wpscan,wp,wp-plugin,wordpress,smart-manager-for-wp-e-commerce,sqli
+  tags: time-based-sqli,wpscan,wp,wp-plugin,wordpress,smart-manager-for-wp-e-commerce,sqli
 
 http:
   - raw:
diff --git a/http/vulnerabilities/wordpress/wp-statistics-sqli.yaml b/http/vulnerabilities/wordpress/wp-statistics-sqli.yaml
index c8781f7af9..2343d968d9 100644
--- a/http/vulnerabilities/wordpress/wp-statistics-sqli.yaml
+++ b/http/vulnerabilities/wordpress/wp-statistics-sqli.yaml
@@ -19,7 +19,7 @@ info:
     vendor: veronalabs
     product: wp_statistics
     publicwww-query: /wp-content/plugins/wp-statistics/
-  tags: time-based,sqli,unauth,exploitdb,wp-statistics,wp-plugin,wordpress,wp
+  tags: time-based-sqli,sqli,unauth,exploitdb,wp-statistics,wp-plugin,wordpress,wp
 flow: http(1) && http(2)
 
 http:
diff --git a/http/vulnerabilities/wordpress/zero-spam-sql-injection.yaml b/http/vulnerabilities/wordpress/zero-spam-sql-injection.yaml
index a96f3f7908..6cbd9b3301 100644
--- a/http/vulnerabilities/wordpress/zero-spam-sql-injection.yaml
+++ b/http/vulnerabilities/wordpress/zero-spam-sql-injection.yaml
@@ -13,7 +13,7 @@ info:
   metadata:
     verified: true
     max-request: 1
-  tags: time-based,wpscan,wp,wp-plugin,wordpress,zero-spam,sqli,unauth
+  tags: time-based-sqli,wpscan,wp,wp-plugin,wordpress,zero-spam,sqli,unauth
 
 http:
   - raw:
diff --git a/http/vulnerabilities/yonyou/yonyou-u8-sqli.yaml b/http/vulnerabilities/yonyou/yonyou-u8-sqli.yaml
index a972c7dd12..92ed46113d 100644
--- a/http/vulnerabilities/yonyou/yonyou-u8-sqli.yaml
+++ b/http/vulnerabilities/yonyou/yonyou-u8-sqli.yaml
@@ -13,7 +13,7 @@ info:
     verified: true
     max-request: 2
     fofa-query: icon_hash="-299520369"
-  tags: time-based,yonyou,grp,sqli
+  tags: time-based-sqli,yonyou,grp,sqli
 
 flow: http(1) && http(2)
 
diff --git a/http/vulnerabilities/yonyou/yonyou-ufida-nc-cloud-sqli.yaml b/http/vulnerabilities/yonyou/yonyou-ufida-nc-cloud-sqli.yaml
index c929deee00..cb82dc188b 100644
--- a/http/vulnerabilities/yonyou/yonyou-ufida-nc-cloud-sqli.yaml
+++ b/http/vulnerabilities/yonyou/yonyou-ufida-nc-cloud-sqli.yaml
@@ -12,7 +12,7 @@ info:
     max-request: 1
     verified: true
     fofa-query: app="用友-NC-Cloud"
-  tags: time-based,sqli,yonyou,ufida
+  tags: time-based-sqli,sqli,yonyou,ufida
 
 http:
   - raw: