diff --git a/ifx-vetting/machinetag.json b/ifx-vetting/machinetag.json
index bbd8987..89804ef 100644
--- a/ifx-vetting/machinetag.json
+++ b/ifx-vetting/machinetag.json
@@ -1,7 +1,7 @@
 {
   "namespace": "ifx-vetting",
   "description": "The IFX taxonomy is used to categorise information (MISP events and attributes) to aid in the intelligence vetting process",
-  "version": 1,
+  "version": 2,
   "predicates": [
     {
       "value": "vetted",
@@ -58,408 +58,307 @@
       "predicate": "score",
       "entry": [
         {
-          "value": "0",
-          "expanded": ""
+          "value": "0"
         },
         {
-          "value": "1",
-          "expanded": ""
+          "value": "1"
         },
         {
-          "value": "2",
-          "expanded": ""
+          "value": "2"
         },
         {
-          "value": "3",
-          "expanded": ""
+          "value": "3"
         },
         {
-          "value": "4",
-          "expanded": ""
+          "value": "4"
         },
         {
-          "value": "5",
-          "expanded": ""
+          "value": "5"
         },
         {
-          "value": "6",
-          "expanded": ""
+          "value": "6"
         },
         {
-          "value": "7",
-          "expanded": ""
+          "value": "7"
         },
         {
-          "value": "8",
-          "expanded": ""
+          "value": "8"
         },
         {
-          "value": "9",
-          "expanded": ""
+          "value": "9"
         },
         {
-          "value": "10",
-          "expanded": ""
+          "value": "10"
         },
         {
-          "value": "11",
-          "expanded": ""
+          "value": "11"
         },
         {
-          "value": "12",
-          "expanded": ""
+          "value": "12"
         },
         {
-          "value": "13",
-          "expanded": ""
+          "value": "13"
         },
         {
-          "value": "14",
-          "expanded": ""
+          "value": "14"
         },
         {
-          "value": "15",
-          "expanded": ""
+          "value": "15"
         },
         {
-          "value": "16",
-          "expanded": ""
+          "value": "16"
         },
         {
-          "value": "17",
-          "expanded": ""
+          "value": "17"
         },
         {
-          "value": "18",
-          "expanded": ""
+          "value": "18"
         },
         {
-          "value": "19",
-          "expanded": ""
+          "value": "19"
         },
         {
-          "value": "20",
-          "expanded": ""
+          "value": "20"
         },
         {
-          "value": "21",
-          "expanded": ""
+          "value": "21"
         },
         {
-          "value": "22",
-          "expanded": ""
+          "value": "22"
         },
         {
-          "value": "23",
-          "expanded": ""
+          "value": "23"
         },
         {
-          "value": "24",
-          "expanded": ""
+          "value": "24"
         },
         {
-          "value": "25",
-          "expanded": ""
+          "value": "25"
         },
         {
-          "value": "26",
-          "expanded": ""
+          "value": "26"
         },
         {
-          "value": "27",
-          "expanded": ""
+          "value": "27"
         },
         {
-          "value": "28",
-          "expanded": ""
+          "value": "28"
         },
         {
-          "value": "29",
-          "expanded": ""
+          "value": "29"
         },
         {
-          "value": "30",
-          "expanded": ""
+          "value": "30"
         },
         {
-          "value": "31",
-          "expanded": ""
+          "value": "31"
         },
         {
-          "value": "32",
-          "expanded": ""
+          "value": "32"
         },
         {
-          "value": "33",
-          "expanded": ""
+          "value": "33"
         },
         {
-          "value": "34",
-          "expanded": ""
+          "value": "34"
         },
         {
-          "value": "35",
-          "expanded": ""
+          "value": "35"
         },
         {
-          "value": "36",
-          "expanded": ""
+          "value": "36"
         },
         {
-          "value": "37",
-          "expanded": ""
+          "value": "37"
         },
         {
-          "value": "38",
-          "expanded": ""
+          "value": "38"
         },
         {
-          "value": "39",
-          "expanded": ""
+          "value": "39"
         },
         {
-          "value": "40",
-          "expanded": ""
+          "value": "40"
         },
         {
-          "value": "41",
-          "expanded": ""
+          "value": "41"
         },
         {
-          "value": "42",
-          "expanded": ""
+          "value": "42"
         },
         {
-          "value": "43",
-          "expanded": ""
+          "value": "43"
         },
         {
-          "value": "44",
-          "expanded": ""
+          "value": "44"
         },
         {
-          "value": "45",
-          "expanded": ""
+          "value": "45"
         },
         {
-          "value": "46",
-          "expanded": ""
+          "value": "46"
         },
         {
-          "value": "47",
-          "expanded": ""
+          "value": "47"
         },
         {
-          "value": "48",
-          "expanded": ""
+          "value": "48"
         },
         {
-          "value": "49",
-          "expanded": ""
+          "value": "49"
         },
         {
-          "value": "50",
-          "expanded": ""
+          "value": "50"
         },
         {
-          "value": "51",
-          "expanded": ""
+          "value": "51"
         },
         {
-          "value": "52",
-          "expanded": ""
+          "value": "52"
         },
         {
-          "value": "53",
-          "expanded": ""
+          "value": "53"
         },
         {
-          "value": "54",
-          "expanded": ""
+          "value": "54"
         },
         {
-          "value": "55",
-          "expanded": ""
+          "value": "55"
         },
         {
-          "value": "56",
-          "expanded": ""
+          "value": "56"
         },
         {
-          "value": "57",
-          "expanded": ""
+          "value": "57"
         },
         {
-          "value": "58",
-          "expanded": ""
+          "value": "58"
         },
         {
-          "value": "59",
-          "expanded": ""
+          "value": "59"
         },
         {
-          "value": "60",
-          "expanded": ""
+          "value": "60"
         },
         {
-          "value": "61",
-          "expanded": ""
+          "value": "61"
         },
         {
-          "value": "62",
-          "expanded": ""
+          "value": "62"
         },
         {
-          "value": "63",
-          "expanded": ""
+          "value": "63"
         },
         {
-          "value": "64",
-          "expanded": ""
+          "value": "64"
         },
         {
-          "value": "65",
-          "expanded": ""
+          "value": "65"
         },
         {
-          "value": "66",
-          "expanded": ""
+          "value": "66"
         },
         {
-          "value": "67",
-          "expanded": ""
+          "value": "67"
         },
         {
-          "value": "68",
-          "expanded": ""
+          "value": "68"
         },
         {
-          "value": "69",
-          "expanded": ""
+          "value": "69"
         },
         {
-          "value": "70",
-          "expanded": ""
+          "value": "70"
         },
         {
-          "value": "71",
-          "expanded": ""
+          "value": "71"
         },
         {
-          "value": "72",
-          "expanded": ""
+          "value": "72"
         },
         {
-          "value": "73",
-          "expanded": ""
+          "value": "73"
         },
         {
-          "value": "74",
-          "expanded": ""
+          "value": "74"
         },
         {
-          "value": "75",
-          "expanded": ""
+          "value": "75"
         },
         {
-          "value": "76",
-          "expanded": ""
+          "value": "76"
         },
         {
-          "value": "77",
-          "expanded": ""
+          "value": "77"
         },
         {
-          "value": "78",
-          "expanded": ""
+          "value": "78"
         },
         {
-          "value": "79",
-          "expanded": ""
+          "value": "79"
         },
         {
-          "value": "80",
-          "expanded": ""
+          "value": "80"
         },
         {
-          "value": "81",
-          "expanded": ""
+          "value": "81"
         },
         {
-          "value": "82",
-          "expanded": ""
+          "value": "82"
         },
         {
-          "value": "83",
-          "expanded": ""
+          "value": "83"
         },
         {
-          "value": "84",
-          "expanded": ""
+          "value": "84"
         },
         {
-          "value": "85",
-          "expanded": ""
+          "value": "85"
         },
         {
-          "value": "86",
-          "expanded": ""
+          "value": "86"
         },
         {
-          "value": "87",
-          "expanded": ""
+          "value": "87"
         },
         {
-          "value": "88",
-          "expanded": ""
+          "value": "88"
         },
         {
-          "value": "89",
-          "expanded": ""
+          "value": "89"
         },
         {
-          "value": "90",
-          "expanded": ""
+          "value": "90"
         },
         {
-          "value": "91",
-          "expanded": ""
+          "value": "91"
         },
         {
-          "value": "92",
-          "expanded": ""
+          "value": "92"
         },
         {
-          "value": "93",
-          "expanded": ""
+          "value": "93"
         },
         {
-          "value": "94",
-          "expanded": ""
+          "value": "94"
         },
         {
-          "value": "95",
-          "expanded": ""
+          "value": "95"
         },
         {
-          "value": "96",
-          "expanded": ""
+          "value": "96"
         },
         {
-          "value": "97",
-          "expanded": ""
+          "value": "97"
         },
         {
-          "value": "98",
-          "expanded": ""
+          "value": "98"
         },
         {
-          "value": "99",
-          "expanded": ""
+          "value": "99"
         },
         {
-          "value": "100",
-          "expanded": ""
+          "value": "100"
         }
       ]
     }