diff --git a/rules/S2053/csharp/metadata.json b/rules/S2053/csharp/metadata.json
index 17971333806..1708b42a84b 100644
--- a/rules/S2053/csharp/metadata.json
+++ b/rules/S2053/csharp/metadata.json
@@ -1,3 +1,6 @@
 {
-  
+  "tags": [
+    "cwe",
+    "symbolic-execution"
+  ]
 }
diff --git a/rules/S2053/vbnet/metadata.json b/rules/S2053/vbnet/metadata.json
index 17971333806..5941afa1af4 100644
--- a/rules/S2053/vbnet/metadata.json
+++ b/rules/S2053/vbnet/metadata.json
@@ -1,3 +1,6 @@
 {
-  
+    "tags": [
+        "cwe",
+        "symbolic-execution"
+      ]
 }
diff --git a/rules/S2222/java/metadata.json b/rules/S2222/java/metadata.json
index 4bc9bcaa0fd..17971333806 100644
--- a/rules/S2222/java/metadata.json
+++ b/rules/S2222/java/metadata.json
@@ -1,7 +1,3 @@
 {
-  "tags": [
-    "cwe",
-    "multi-threading",
-    "symbolic-execution"
-  ]
+  
 }
diff --git a/rules/S2222/metadata.json b/rules/S2222/metadata.json
index dd2383bd240..e361d8b8bff 100644
--- a/rules/S2222/metadata.json
+++ b/rules/S2222/metadata.json
@@ -14,7 +14,8 @@
   },
   "tags": [
     "cwe",
-    "multi-threading"
+    "multi-threading",
+    "symbolic-execution"
   ],
   "extra": {
     "replacementRules": [
diff --git a/rules/S2259/csharp/metadata.json b/rules/S2259/csharp/metadata.json
index bb3d04f385c..190d8cece38 100644
--- a/rules/S2259/csharp/metadata.json
+++ b/rules/S2259/csharp/metadata.json
@@ -1,3 +1,7 @@
 {
-  "quickfix": "infeasible"
+  "quickfix": "infeasible",
+  "tags": [
+    "cwe",
+    "symbolic-execution"
+    ]
 }
diff --git a/rules/S2259/vbnet/metadata.json b/rules/S2259/vbnet/metadata.json
index bb3d04f385c..190d8cece38 100644
--- a/rules/S2259/vbnet/metadata.json
+++ b/rules/S2259/vbnet/metadata.json
@@ -1,3 +1,7 @@
 {
-  "quickfix": "infeasible"
+  "quickfix": "infeasible",
+  "tags": [
+    "cwe",
+    "symbolic-execution"
+    ]
 }
diff --git a/rules/S2583/csharp/metadata.json b/rules/S2583/csharp/metadata.json
index 82d2b123450..27e2c1ad07e 100644
--- a/rules/S2583/csharp/metadata.json
+++ b/rules/S2583/csharp/metadata.json
@@ -1,3 +1,10 @@
 {
-  "quickfix": "targeted"
+  "quickfix": "targeted",
+  "tags": [
+    "cwe",
+    "unused",
+    "suspicious",
+    "pitfall",
+    "symbolic-execution"
+    ]
 }
diff --git a/rules/S2583/vbnet/metadata.json b/rules/S2583/vbnet/metadata.json
index 82d2b123450..27e2c1ad07e 100644
--- a/rules/S2583/vbnet/metadata.json
+++ b/rules/S2583/vbnet/metadata.json
@@ -1,3 +1,10 @@
 {
-  "quickfix": "targeted"
+  "quickfix": "targeted",
+  "tags": [
+    "cwe",
+    "unused",
+    "suspicious",
+    "pitfall",
+    "symbolic-execution"
+    ]
 }
diff --git a/rules/S2589/csharp/metadata.json b/rules/S2589/csharp/metadata.json
index 17971333806..2b1b8d68008 100644
--- a/rules/S2589/csharp/metadata.json
+++ b/rules/S2589/csharp/metadata.json
@@ -1,3 +1,8 @@
 {
-  
+    "tags": [
+        "cwe",
+        "suspicious",
+        "redundant",
+        "symbolic-execution"
+      ]
 }
diff --git a/rules/S2589/vbnet/metadata.json b/rules/S2589/vbnet/metadata.json
index 3811ab0a164..753a79b6b62 100644
--- a/rules/S2589/vbnet/metadata.json
+++ b/rules/S2589/vbnet/metadata.json
@@ -1,3 +1,9 @@
 {
-    "quickfix": "targeted" 
+    "quickfix": "targeted" ,
+    "tags": [
+        "cwe",
+        "suspicious",
+        "redundant",
+        "symbolic-execution"
+      ]
 }
diff --git a/rules/S3329/csharp/metadata.json b/rules/S3329/csharp/metadata.json
index 82d2b123450..f6e63de38f1 100644
--- a/rules/S3329/csharp/metadata.json
+++ b/rules/S3329/csharp/metadata.json
@@ -1,3 +1,7 @@
 {
-  "quickfix": "targeted"
+  "quickfix": "targeted",
+  "tags": [
+      "cwe",
+      "symbolic-execution"
+    ]
 }
diff --git a/rules/S3329/vbnet/metadata.json b/rules/S3329/vbnet/metadata.json
index 82d2b123450..f6e63de38f1 100644
--- a/rules/S3329/vbnet/metadata.json
+++ b/rules/S3329/vbnet/metadata.json
@@ -1,3 +1,7 @@
 {
-  "quickfix": "targeted"
+  "quickfix": "targeted",
+  "tags": [
+      "cwe",
+      "symbolic-execution"
+    ]
 }
diff --git a/rules/S3655/java/metadata.json b/rules/S3655/java/metadata.json
index 30bfb33b844..e104ad4426c 100644
--- a/rules/S3655/java/metadata.json
+++ b/rules/S3655/java/metadata.json
@@ -1,7 +1,3 @@
 {
-  "title": "Optional value should only be accessed after calling isPresent()",
-  "tags": [
-  	"cwe",
-    "symbolic-execution"
-  ]
+  "title": "Optional value should only be accessed after calling isPresent()"
 }
diff --git a/rules/S3655/metadata.json b/rules/S3655/metadata.json
index ec4fad90a7a..9c5b673de10 100644
--- a/rules/S3655/metadata.json
+++ b/rules/S3655/metadata.json
@@ -13,7 +13,8 @@
     "constantCost": "10min"
   },
   "tags": [
-    "cwe"
+    "cwe",
+    "symbolic-execution"
   ],
   "extra": {
     "replacementRules": [
diff --git a/rules/S3900/metadata.json b/rules/S3900/metadata.json
index 295fc348a5b..964165f8357 100644
--- a/rules/S3900/metadata.json
+++ b/rules/S3900/metadata.json
@@ -13,7 +13,8 @@
     "constantCost": "5min"
   },
   "tags": [
-    "convention"
+    "convention",
+    "symbolic-execution"
   ],
   "extra": {
     "replacementRules": [
diff --git a/rules/S3949/metadata.json b/rules/S3949/metadata.json
index 600391eeb89..24e2878c0fd 100644
--- a/rules/S3949/metadata.json
+++ b/rules/S3949/metadata.json
@@ -13,7 +13,8 @@
     "constantCost": "5min"
   },
   "tags": [
-    "overflow"
+    "overflow",
+    "symbolic-execution"
   ],
   "extra": {
     "replacementRules": [
diff --git a/rules/S3966/metadata.json b/rules/S3966/metadata.json
index 539e1e541a4..e50bea45241 100644
--- a/rules/S3966/metadata.json
+++ b/rules/S3966/metadata.json
@@ -14,7 +14,8 @@
   },
   "tags": [
     "confusing",
-    "pitfall"
+    "pitfall",
+    "symbolic-execution"
   ],
   "extra": {
     "replacementRules": [
diff --git a/rules/S4158/csharp/metadata.json b/rules/S4158/csharp/metadata.json
index b573bff24f6..d3a67915199 100644
--- a/rules/S4158/csharp/metadata.json
+++ b/rules/S4158/csharp/metadata.json
@@ -1,3 +1,6 @@
 {
-    "quickfix": "infeasible"
+    "quickfix": "infeasible",
+    "tags": [
+        "symbolic-execution"
+        ]
 }
diff --git a/rules/S4158/vbnet/metadata.json b/rules/S4158/vbnet/metadata.json
index b573bff24f6..d133001aa94 100644
--- a/rules/S4158/vbnet/metadata.json
+++ b/rules/S4158/vbnet/metadata.json
@@ -1,3 +1,6 @@
 {
-    "quickfix": "infeasible"
+    "quickfix": "infeasible",
+    "tags": [
+        "symbolic-execution"
+    ]
 }
diff --git a/rules/S4347/csharp/metadata.json b/rules/S4347/csharp/metadata.json
index 7a73a41bfdf..5318d13c34f 100644
--- a/rules/S4347/csharp/metadata.json
+++ b/rules/S4347/csharp/metadata.json
@@ -1,2 +1,8 @@
 {
+    "tags":[
+        "cwe",
+        "cert",
+        "pitfall",    
+        "symbolic-execution"
+    ]
 }
\ No newline at end of file
diff --git a/rules/S5773/metadata.json b/rules/S5773/metadata.json
index 3c322512589..e27aff1452f 100644
--- a/rules/S5773/metadata.json
+++ b/rules/S5773/metadata.json
@@ -14,7 +14,8 @@
     "constantCost": "30min"
   },
   "tags": [
-    "cwe"
+    "cwe",
+    "symbolic-execution"
   ],
   "extra": {
     "replacementRules": [
diff --git a/rules/S6781/csharp/metadata.json b/rules/S6781/csharp/metadata.json
index 7a73a41bfdf..598adf23a3c 100644
--- a/rules/S6781/csharp/metadata.json
+++ b/rules/S6781/csharp/metadata.json
@@ -1,2 +1,7 @@
 {
+    "tags": [
+        "cwe",
+        "cert",
+        "symbolic-execution"
+    ]
 }
\ No newline at end of file
diff --git a/rules/S7130/metadata.json b/rules/S7130/metadata.json
index bd17ee9ddff..84f36e3931d 100644
--- a/rules/S7130/metadata.json
+++ b/rules/S7130/metadata.json
@@ -7,6 +7,7 @@
     "constantCost": "1min"
   },
   "tags": [
+    "symbolic-execution"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-7130",
diff --git a/rules/S7131/metadata.json b/rules/S7131/metadata.json
index 6746948bd61..96691982fe2 100644
--- a/rules/S7131/metadata.json
+++ b/rules/S7131/metadata.json
@@ -7,6 +7,7 @@
     "constantCost": "30min"
   },
   "tags": [
+    "symbolic-execution"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-7131",
diff --git a/rules/S7133/metadata.json b/rules/S7133/metadata.json
index 857ac7be582..710b53dd3bf 100644
--- a/rules/S7133/metadata.json
+++ b/rules/S7133/metadata.json
@@ -7,6 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
+    "symbolic-execution"
   ],
   "defaultSeverity": "Major",
   "ruleSpecification": "RSPEC-7133",