diff --git a/package-lock.json b/package-lock.json
index e7c90581b4..779c3d04e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@asyncapi/avro-schema-parser": "^1.1.0",
         "@asyncapi/converter": "^1.0.0",
         "@asyncapi/openapi-schema-parser": "^2.0.1",
-        "@asyncapi/parser": "file:../parser-js/asyncapi-parser-2.0.0.tgz",
+        "@asyncapi/parser": "^2.0.0-next-major.2",
         "@asyncapi/react-component": "^1.0.0-next.42",
         "@asyncapi/specs": "^3.1.0",
         "@headlessui/react": "1.4.1",
@@ -765,10 +765,9 @@
       }
     },
     "node_modules/@asyncapi/parser": {
-      "version": "2.0.0",
-      "resolved": "file:../parser-js/asyncapi-parser-2.0.0.tgz",
-      "integrity": "sha512-dksgu9dGySyRukgm29wuslownitS2AB/xQSdh82OyjCOcoxGwnvXJh1Ay6WMOSTyJ+nC0ELEaPqA2t+20WNRTg==",
-      "license": "Apache-2.0",
+      "version": "2.0.0-next-major.2",
+      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-2.0.0-next-major.2.tgz",
+      "integrity": "sha512-IwvwojeLriRVqjb4NTHXECFZeAMVW/wedZKhBgQ06asVk+oqLz1iXGfuxh2dmCbatCqwKj75/W5+cIIWQC4OeA==",
       "dependencies": {
         "@asyncapi/specs": "^3.1.0",
         "@openapi-contrib/openapi-schema-to-json-schema": "^3.2.0",
@@ -912,9 +911,9 @@
       }
     },
     "node_modules/@asyncapi/specs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.1.0.tgz",
-      "integrity": "sha512-6xFvzDd54+M9g6EM259Y4a4iiFb2VzPr6eoxA/ttwTu7NRxaGScocXskXtuz53ZWx9BWZWuzwDYKfM3KBkDfiQ=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.2.1.tgz",
+      "integrity": "sha512-FO+EteK+Gk3zwumrBw6frpp9cJ4oQL5++hBBpfM81w16e9KaiA4sKrzvQsvVjifoZZHNvVEX4D2zoz9i8CLccQ=="
     },
     "node_modules/@asyncapi/ts-nats-template": {
       "version": "0.5.21",
@@ -4627,17 +4626,6 @@
       "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz",
       "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="
     },
-    "node_modules/@stoplight/lifecycle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@stoplight/lifecycle/-/lifecycle-2.3.2.tgz",
-      "integrity": "sha512-v0u8p27FA/eg04b4z6QXw4s0NeeFcRzyvseBW0+k/q4jtpg7EhVCqy42EbbbU43NTNDpIeQ81OcvkFz+6CYshw==",
-      "dependencies": {
-        "wolfy87-eventemitter": "~5.2.8"
-      },
-      "engines": {
-        "node": ">=8.3.0"
-      }
-    },
     "node_modules/@stoplight/ordered-object-literal": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@stoplight/ordered-object-literal/-/ordered-object-literal-1.0.4.tgz",
@@ -4655,13 +4643,12 @@
       }
     },
     "node_modules/@stoplight/spectral-core": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.14.1.tgz",
-      "integrity": "sha512-UMPfkrDqIMiAoZuVx4QiVV3D5fssfhDQ6R36qTP3x0hZFOeVDIFIcVdKV8lgmvsbpKaOgU/AD/2s4jScyTIqoA==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.14.2.tgz",
+      "integrity": "sha512-W2Z31lasEICpZS50STFskOdkn4g0Va81XA1A88LIj9mvlctDFf4BfpjLgIjKkI4f2DEK5C4j3COcbbzV8y5Xig==",
       "dependencies": {
         "@stoplight/better-ajv-errors": "1.0.3",
         "@stoplight/json": "~3.20.1",
-        "@stoplight/lifecycle": "2.3.2",
         "@stoplight/path": "1.3.2",
         "@stoplight/spectral-parsers": "^1.0.0",
         "@stoplight/spectral-ref-resolver": "^1.0.0",
@@ -4716,9 +4703,9 @@
       }
     },
     "node_modules/@stoplight/spectral-formats": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.2.0.tgz",
-      "integrity": "sha512-idvn7r8fvQjY/KeJpKgXQ5eJhce6N6/KoKWMPSh5yyvYDpn+bkU4pxAD79jOJaDnIyKJd1jjTPEJWnxbS0jj6A==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.4.0.tgz",
+      "integrity": "sha512-j9VQukDzgqDSi26rK9LqsbXrqtkeIsPSPgEf5/sxRsmeF2bwWUhSjYXgYin4flSZ7owFZjZWQ3o0Qq3iApi2JQ==",
       "dependencies": {
         "@stoplight/json": "^3.17.0",
         "@stoplight/spectral-core": "^1.8.0",
@@ -4773,13 +4760,13 @@
       }
     },
     "node_modules/@stoplight/spectral-ref-resolver": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-ref-resolver/-/spectral-ref-resolver-1.0.1.tgz",
-      "integrity": "sha512-0tY7nTOccvTsa3c4QbSWfJ8wGfPO1RXvmKnmBjuyLfoTMNuhkHPII9gKhCjygsshzsBLxs2IyRHZYhWYVnEbCA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-ref-resolver/-/spectral-ref-resolver-1.0.2.tgz",
+      "integrity": "sha512-ah6NIB/O1EdEaEu89So3LmtbKRXPVnSElgQ7oBRE9S4/VOedSqyXn+qqMd40tGnO2CsKgZaFUYXdSEHOshpHYw==",
       "dependencies": {
         "@stoplight/json-ref-readers": "1.2.2",
-        "@stoplight/json-ref-resolver": "3.1.3",
-        "@stoplight/spectral-runtime": "^1.0.0",
+        "@stoplight/json-ref-resolver": "~3.1.4",
+        "@stoplight/spectral-runtime": "^1.1.2",
         "dependency-graph": "0.11.0",
         "tslib": "^2.3.1"
       },
@@ -4787,58 +4774,16 @@
         "node": ">=12"
       }
     },
-    "node_modules/@stoplight/spectral-ref-resolver/node_modules/@stoplight/json-ref-resolver": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@stoplight/json-ref-resolver/-/json-ref-resolver-3.1.3.tgz",
-      "integrity": "sha512-SgoKXwVnlpIZUyAFX4W79eeuTWvXmNlMfICZixL16GZXnkjcW+uZnfmAU0ZIjcnaTgaI4mjfxn8LAP2KR6Cr0A==",
-      "dependencies": {
-        "@stoplight/json": "^3.17.0",
-        "@stoplight/path": "^1.3.2",
-        "@stoplight/types": "^12.3.0",
-        "@types/urijs": "^1.19.16",
-        "dependency-graph": "~0.11.0",
-        "fast-memoize": "^2.5.2",
-        "immer": "^9.0.6",
-        "lodash.get": "^4.4.2",
-        "lodash.set": "^4.3.2",
-        "tslib": "^2.3.1",
-        "urijs": "^1.19.6"
-      },
-      "engines": {
-        "node": ">=8.3.0"
-      }
-    },
-    "node_modules/@stoplight/spectral-ref-resolver/node_modules/@stoplight/types": {
-      "version": "12.5.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/types/-/types-12.5.0.tgz",
-      "integrity": "sha512-dwqYcDrGmEyUv5TWrDam5TGOxU72ufyQ7hnOIIDdmW5ezOwZaBFoR5XQ9AsH49w7wgvOqB2Bmo799pJPWnpCbg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "utility-types": "^3.10.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@stoplight/spectral-ref-resolver/node_modules/immer": {
-      "version": "9.0.15",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.15.tgz",
-      "integrity": "sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
     "node_modules/@stoplight/spectral-rulesets": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.13.0.tgz",
-      "integrity": "sha512-d1I76FUcKIZh9zR3/RcN+KH3dg1xp8FsKRkY/WnsV7H8pnG2lbyPVHgSCNE06fVg8E01H5uwmee1ChtjgHJmOQ==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.14.0.tgz",
+      "integrity": "sha512-yE4V7GYXfcr7QC15clsOTUmecsZqU1upcgvoU8RFJ/yToAsky74EhY+weV9ecfUWrwuamdiTy3MafrsWaywiuA==",
       "dependencies": {
-        "@asyncapi/specs": "^2.14.0",
+        "@asyncapi/specs": "^3.2.0",
         "@stoplight/better-ajv-errors": "1.0.3",
         "@stoplight/json": "^3.17.0",
         "@stoplight/spectral-core": "^1.8.1",
-        "@stoplight/spectral-formats": "^1.2.0",
+        "@stoplight/spectral-formats": "^1.4.0",
         "@stoplight/spectral-functions": "^1.5.1",
         "@stoplight/spectral-runtime": "^1.1.1",
         "@stoplight/types": "^13.6.0",
@@ -4853,11 +4798,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@stoplight/spectral-rulesets/node_modules/@asyncapi/specs": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.14.0.tgz",
-      "integrity": "sha512-hHsYF6XsYNIKb1P2rXaooF4H+uKKQ4b/Ljxrk3rZ3riEDiSxMshMEfb1fUlw9Yj4V4OmJhjXwkNvw8W59AXv1A=="
-    },
     "node_modules/@stoplight/spectral-runtime": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@stoplight/spectral-runtime/-/spectral-runtime-1.1.2.tgz",
@@ -18124,11 +18064,6 @@
       "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==",
       "dev": true
     },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
-    },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -18164,11 +18099,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="
-    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -36605,11 +36535,6 @@
       "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
       "dev": true
     },
-    "node_modules/wolfy87-eventemitter": {
-      "version": "5.2.9",
-      "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz",
-      "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw=="
-    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -37878,8 +37803,9 @@
       }
     },
     "@asyncapi/parser": {
-      "version": "file:../parser-js/asyncapi-parser-2.0.0.tgz",
-      "integrity": "sha512-dksgu9dGySyRukgm29wuslownitS2AB/xQSdh82OyjCOcoxGwnvXJh1Ay6WMOSTyJ+nC0ELEaPqA2t+20WNRTg==",
+      "version": "2.0.0-next-major.2",
+      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-2.0.0-next-major.2.tgz",
+      "integrity": "sha512-IwvwojeLriRVqjb4NTHXECFZeAMVW/wedZKhBgQ06asVk+oqLz1iXGfuxh2dmCbatCqwKj75/W5+cIIWQC4OeA==",
       "requires": {
         "@asyncapi/specs": "^3.1.0",
         "@openapi-contrib/openapi-schema-to-json-schema": "^3.2.0",
@@ -38013,9 +37939,15 @@
       }
     },
     "@asyncapi/specs": {
+<<<<<<< master
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.2.0.tgz",
       "integrity": "sha512-4tzJfhAk5IetJyUDzxl6oQ5oNDnX8+Q7kM62eksONdhJlfU9KYzx/mUeQrbHTFKBROi6yKXcYD842+ahICk8EA=="
+=======
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-3.2.1.tgz",
+      "integrity": "sha512-FO+EteK+Gk3zwumrBw6frpp9cJ4oQL5++hBBpfM81w16e9KaiA4sKrzvQsvVjifoZZHNvVEX4D2zoz9i8CLccQ=="
+>>>>>>> use latest parser
     },
     "@asyncapi/ts-nats-template": {
       "version": "0.5.21",
@@ -40776,14 +40708,6 @@
         }
       }
     },
-    "@stoplight/lifecycle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@stoplight/lifecycle/-/lifecycle-2.3.2.tgz",
-      "integrity": "sha512-v0u8p27FA/eg04b4z6QXw4s0NeeFcRzyvseBW0+k/q4jtpg7EhVCqy42EbbbU43NTNDpIeQ81OcvkFz+6CYshw==",
-      "requires": {
-        "wolfy87-eventemitter": "~5.2.8"
-      }
-    },
     "@stoplight/ordered-object-literal": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@stoplight/ordered-object-literal/-/ordered-object-literal-1.0.4.tgz",
@@ -40795,13 +40719,12 @@
       "integrity": "sha512-lyIc6JUlUA8Ve5ELywPC8I2Sdnh1zc1zmbYgVarhXIp9YeAB0ReeqmGEOWNtlHkbP2DAA1AL65Wfn2ncjK/jtQ=="
     },
     "@stoplight/spectral-core": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.14.1.tgz",
-      "integrity": "sha512-UMPfkrDqIMiAoZuVx4QiVV3D5fssfhDQ6R36qTP3x0hZFOeVDIFIcVdKV8lgmvsbpKaOgU/AD/2s4jScyTIqoA==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.14.2.tgz",
+      "integrity": "sha512-W2Z31lasEICpZS50STFskOdkn4g0Va81XA1A88LIj9mvlctDFf4BfpjLgIjKkI4f2DEK5C4j3COcbbzV8y5Xig==",
       "requires": {
         "@stoplight/better-ajv-errors": "1.0.3",
         "@stoplight/json": "~3.20.1",
-        "@stoplight/lifecycle": "2.3.2",
         "@stoplight/path": "1.3.2",
         "@stoplight/spectral-parsers": "^1.0.0",
         "@stoplight/spectral-ref-resolver": "^1.0.0",
@@ -40847,9 +40770,9 @@
       }
     },
     "@stoplight/spectral-formats": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.2.0.tgz",
-      "integrity": "sha512-idvn7r8fvQjY/KeJpKgXQ5eJhce6N6/KoKWMPSh5yyvYDpn+bkU4pxAD79jOJaDnIyKJd1jjTPEJWnxbS0jj6A==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.4.0.tgz",
+      "integrity": "sha512-j9VQukDzgqDSi26rK9LqsbXrqtkeIsPSPgEf5/sxRsmeF2bwWUhSjYXgYin4flSZ7owFZjZWQ3o0Qq3iApi2JQ==",
       "requires": {
         "@stoplight/json": "^3.17.0",
         "@stoplight/spectral-core": "^1.8.0",
@@ -40895,61 +40818,27 @@
       }
     },
     "@stoplight/spectral-ref-resolver": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-ref-resolver/-/spectral-ref-resolver-1.0.1.tgz",
-      "integrity": "sha512-0tY7nTOccvTsa3c4QbSWfJ8wGfPO1RXvmKnmBjuyLfoTMNuhkHPII9gKhCjygsshzsBLxs2IyRHZYhWYVnEbCA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-ref-resolver/-/spectral-ref-resolver-1.0.2.tgz",
+      "integrity": "sha512-ah6NIB/O1EdEaEu89So3LmtbKRXPVnSElgQ7oBRE9S4/VOedSqyXn+qqMd40tGnO2CsKgZaFUYXdSEHOshpHYw==",
       "requires": {
         "@stoplight/json-ref-readers": "1.2.2",
-        "@stoplight/json-ref-resolver": "3.1.3",
-        "@stoplight/spectral-runtime": "^1.0.0",
+        "@stoplight/json-ref-resolver": "~3.1.4",
+        "@stoplight/spectral-runtime": "^1.1.2",
         "dependency-graph": "0.11.0",
         "tslib": "^2.3.1"
-      },
-      "dependencies": {
-        "@stoplight/json-ref-resolver": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/@stoplight/json-ref-resolver/-/json-ref-resolver-3.1.3.tgz",
-          "integrity": "sha512-SgoKXwVnlpIZUyAFX4W79eeuTWvXmNlMfICZixL16GZXnkjcW+uZnfmAU0ZIjcnaTgaI4mjfxn8LAP2KR6Cr0A==",
-          "requires": {
-            "@stoplight/json": "^3.17.0",
-            "@stoplight/path": "^1.3.2",
-            "@stoplight/types": "^12.3.0",
-            "@types/urijs": "^1.19.16",
-            "dependency-graph": "~0.11.0",
-            "fast-memoize": "^2.5.2",
-            "immer": "^9.0.6",
-            "lodash.get": "^4.4.2",
-            "lodash.set": "^4.3.2",
-            "tslib": "^2.3.1",
-            "urijs": "^1.19.6"
-          }
-        },
-        "@stoplight/types": {
-          "version": "12.5.0",
-          "resolved": "https://registry.npmjs.org/@stoplight/types/-/types-12.5.0.tgz",
-          "integrity": "sha512-dwqYcDrGmEyUv5TWrDam5TGOxU72ufyQ7hnOIIDdmW5ezOwZaBFoR5XQ9AsH49w7wgvOqB2Bmo799pJPWnpCbg==",
-          "requires": {
-            "@types/json-schema": "^7.0.4",
-            "utility-types": "^3.10.0"
-          }
-        },
-        "immer": {
-          "version": "9.0.15",
-          "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.15.tgz",
-          "integrity": "sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ=="
-        }
       }
     },
     "@stoplight/spectral-rulesets": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.13.0.tgz",
-      "integrity": "sha512-d1I76FUcKIZh9zR3/RcN+KH3dg1xp8FsKRkY/WnsV7H8pnG2lbyPVHgSCNE06fVg8E01H5uwmee1ChtjgHJmOQ==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.14.0.tgz",
+      "integrity": "sha512-yE4V7GYXfcr7QC15clsOTUmecsZqU1upcgvoU8RFJ/yToAsky74EhY+weV9ecfUWrwuamdiTy3MafrsWaywiuA==",
       "requires": {
-        "@asyncapi/specs": "^2.14.0",
+        "@asyncapi/specs": "^3.2.0",
         "@stoplight/better-ajv-errors": "1.0.3",
         "@stoplight/json": "^3.17.0",
         "@stoplight/spectral-core": "^1.8.1",
-        "@stoplight/spectral-formats": "^1.2.0",
+        "@stoplight/spectral-formats": "^1.4.0",
         "@stoplight/spectral-functions": "^1.5.1",
         "@stoplight/spectral-runtime": "^1.1.1",
         "@stoplight/types": "^13.6.0",
@@ -40959,13 +40848,6 @@
         "json-schema-traverse": "^1.0.0",
         "lodash": "~4.17.21",
         "tslib": "^2.3.0"
-      },
-      "dependencies": {
-        "@asyncapi/specs": {
-          "version": "2.14.0",
-          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-2.14.0.tgz",
-          "integrity": "sha512-hHsYF6XsYNIKb1P2rXaooF4H+uKKQ4b/Ljxrk3rZ3riEDiSxMshMEfb1fUlw9Yj4V4OmJhjXwkNvw8W59AXv1A=="
-        }
       }
     },
     "@stoplight/spectral-runtime": {
@@ -51235,11 +51117,6 @@
       "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==",
       "dev": true
     },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
-    },
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
@@ -51275,11 +51152,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -65397,11 +65269,6 @@
       "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
       "dev": true
     },
-    "wolfy87-eventemitter": {
-      "version": "5.2.9",
-      "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz",
-      "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw=="
-    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
diff --git a/src/components/Terminal/ProblemsTab.tsx b/src/components/Terminal/ProblemsTab.tsx
index ec03b06b3f..22fe0ac365 100644
--- a/src/components/Terminal/ProblemsTab.tsx
+++ b/src/components/Terminal/ProblemsTab.tsx
@@ -171,7 +171,7 @@ export const ProblemsTabContent: React.FunctionComponent<ProblemsTabProps> = ()
             <SeverityButtons diagnostics={diagnostics} active={active} setActive={setActive} />
             <div className='mx-3 flex-1 flex flex-row items-center justify-center rounded-md border border-transparent shadow-xs px-2 py-1 bg-gray-700 text-xs font-medium'>
               <VscSearch />
-              <input ref={inputRef} className='w-full ml-2 bg-gray-700 border-transparent focus:border-transparent focus:ring-0 focus:outline-none' onChange={debounce((e) => setSearch(e.target.value), 250)} />
+              <input ref={inputRef} placeholder='Filter diagnostics...' className='w-full ml-2 bg-gray-700 border-transparent focus:border-transparent focus:ring-0 focus:outline-none' onChange={debounce((e) => setSearch(e.target.value), 250)} />
               <button type='button' className={`hover:bg-gray-900 rounded-sm border border-transparent ${search ? 'opacity-100' : 'opacity-0'}`} onClick={() => {
                 if (inputRef.current) {
                   inputRef.current.value = '';
@@ -207,7 +207,8 @@ export const ProblemsTabContent: React.FunctionComponent<ProblemsTabProps> = ()
                 if (active !== 'all' && severity !== active) {
                   return null;
                 }
-                if (search && !message.includes(search)) {
+                const lowerCasingSearch = search.toLowerCase();
+                if (lowerCasingSearch && !message.toLowerCase().includes(lowerCasingSearch)) {
                   return null;
                 }
 
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
index 4019065244..73234176bd 100644
--- a/src/react-app-env.d.ts
+++ b/src/react-app-env.d.ts
@@ -1,7 +1,7 @@
 /// <reference types="react-scripts" />
 
 import type * as monacoAPI from 'monaco-editor/esm/vs/editor/editor.api';
-import type { OldAsyncAPIDocument as AsyncAPIDocument } from '@asyncapi/parser/esm';
+import type { OldAsyncAPIDocument as AsyncAPIDocument, ParseOutput } from '@asyncapi/parser/esm';
 
 declare global {
   interface Window {
@@ -9,6 +9,7 @@ declare global {
     monaco: typeof monacoAPI;
     Editor: monacoAPI.editor.IStandaloneCodeEditor;
     MonacoEnvironment: monacoAPI.Environment | undefined;
-    ParsedSpec: AsyncAPIDocument;
+    ParsedSpec?: AsyncAPIDocument;
+    ParsedExtras?: ParseOutput['extras'];
   }
 }
diff --git a/src/services/editor.service.tsx b/src/services/editor.service.tsx
index 64daf53760..3002722d04 100644
--- a/src/services/editor.service.tsx
+++ b/src/services/editor.service.tsx
@@ -235,22 +235,7 @@ export class EditorService {
     const newMarkers: monacoAPI.editor.IMarkerData[] = [];
 
     diagnostics.forEach(diagnostic => {
-      const { message, path, severity } = diagnostic;
-      let { range } = diagnostic;
-
-      if (path.length === 0) {
-        const fullRange = model.getFullModelRange();
-        range = { 
-          start: {
-            line: fullRange.startLineNumber,
-            character: fullRange.startColumn
-          }, 
-          end: {
-            line: fullRange.endLineNumber,
-            character: fullRange.endColumn
-          },
-        };
-      }
+      const { message, range, severity } = diagnostic;
   
       newMarkers.push({
         startLineNumber: range.start.line + 1,
diff --git a/src/services/navigation.service.ts b/src/services/navigation.service.ts
index 489dda98af..7642bcf500 100644
--- a/src/services/navigation.service.ts
+++ b/src/services/navigation.service.ts
@@ -14,14 +14,12 @@ export class NavigationService {
     language = 'yaml',
   ) {
     try {
-      // const location: LocationOf = getLocationOf(jsonPointer, spec, language);
-      // if (!location || typeof location.startLine !== 'number') {
-      //   return;
-      // }
+      const range = SpecificationService.getRangeForJsonPath(jsonPointer);
+      if (range) {
+        this.scrollToEditorLine(range.start.line + 1);
+      }
 
-      language;
       this.scrollToHash(hash);
-      // this.scrollToEditorLine(location.startLine);
       this.emitHashChangeEvent(hash);
     } catch (e) {
       console.error(e);
diff --git a/src/services/specification.service.ts b/src/services/specification.service.ts
index 51edef3659..9cf903caf8 100644
--- a/src/services/specification.service.ts
+++ b/src/services/specification.service.ts
@@ -1,7 +1,7 @@
 // @ts-ignore
 import { convert, ConvertVersion } from '@asyncapi/converter';
 import { Parser, convertToOldAPI } from '@asyncapi/parser/esm';
-import { hasErrorDiagnostic } from '@asyncapi/parser/esm/utils';
+import { untilde } from '@asyncapi/parser/esm/utils';
 import { OpenAPISchemaParser } from '@asyncapi/parser/esm/schema-parser/openapi-schema-parser';
 import { AvroSchemaParser } from '@asyncapi/parser/esm/schema-parser/avro-schema-parser';
 // @ts-ignore
@@ -30,19 +30,23 @@ export class SpecificationService {
     return window.ParsedSpec || null;
   }
 
+  static getParsedExtras() {
+    return window.ParsedExtras || null;
+  }
+
   static async parseSpec(rawSpec: string): Promise<AsyncAPIDocument | void> {
     const parserState = state.parser;
-    const { document, diagnostics } = await parser.parse(rawSpec);
-    const hasErrorDiagnostics = hasErrorDiagnostic(diagnostics);
+    const { document, diagnostics, extras } = await parser.parse(rawSpec);
 
     if (document) {
       const oldDocument = convertToOldAPI(document);
       window.ParsedSpec = oldDocument;
+      window.ParsedExtras = extras;
       parserState.set({
         parsedSpec: oldDocument,
         valid: true,
         diagnostics,
-        hasErrorDiagnostics,
+        hasErrorDiagnostics: false,
       });
 
       const version = oldDocument.version();
@@ -59,6 +63,8 @@ export class SpecificationService {
       return oldDocument;
     }
 
+    window.ParsedSpec = undefined;
+    window.ParsedExtras = undefined;
     try {
       const asyncapiSpec = YAML.load(rawSpec) as { asyncapi: string };
       MonacoService.updateLanguageConfig(asyncapiSpec.asyncapi);
@@ -70,7 +76,7 @@ export class SpecificationService {
       parsedSpec: null,
       valid: false,
       diagnostics,
-      hasErrorDiagnostics,
+      hasErrorDiagnostics: true,
     });
     EditorService.applyMarkers(diagnostics);
   }
@@ -122,91 +128,16 @@ export class SpecificationService {
     return false;
   }
 
-  static errorHasLocation(err: any) {
-    return (
-      this.isValidationError(err) ||
-      this.isJsonError(err) ||
-      this.isYamlError(err) ||
-      this.isDereferenceError(err) ||
-      this.isUnsupportedVersionError(err)
-    );
-  }
-
-  private static notSupportedVersions = /('|"|)asyncapi('|"|): ('|"|)(1.0.0|1.1.0|1.2.0|2.0.0-rc1|2.0.0-rc2)('|"|)/;
-
-  private static filterErrors(err: any, rawSpec: string) {
-    const errors = [];
-    if (this.isUnsupportedVersionError(err)) {
-      errors.push({
-        type: err.type,
-        title: err.message,
-        location: err.validationErrors,
-      });
-      this.isNotSupportedVersion(rawSpec) &&
-        state.spec.set({
-          shouldOpenConvertModal: true,
-          convertOnlyToLatest: false,
-          forceConvert: true,
-        });
-    }
-    if (this.isValidationError(err)) {
-      errors.push(...err.validationErrors);
-    }
-    if (this.isYamlError(err) || this.isJsonError(err)) {
-      errors.push(err);
-    }
-    if (this.isDereferenceError(err)) {
-      errors.push(
-        ...err.refs.map((ref: any) => ({
-          type: err.type,
-          title: err.title,
-          location: { ...ref },
-        })),
-      );
-    }
-    if (errors.length === 0) {
-      errors.push(err);
-    }
-    return errors;
-  }
-
-  private static isValidationError(err: any) {
-    return (
-      err &&
-      err.type === 'https://github.com/asyncapi/parser-js/validation-errors'
-    );
-  }
-
-  private static isJsonError(err: any) {
-    return (
-      err && err.type === 'https://github.com/asyncapi/parser-js/invalid-json'
-    );
-  }
-
-  private static isYamlError(err: any) {
-    return (
-      err && err.type === 'https://github.com/asyncapi/parser-js/invalid-yaml'
-    );
-  }
-
-  private static isUnsupportedVersionError(err: any) {
-    return (
-      err &&
-      err.type === 'https://github.com/asyncapi/parser-js/unsupported-version'
-    );
-  }
-
-  private static isDereferenceError(err: any) {
-    return (
-      err &&
-      err.type === 'https://github.com/asyncapi/parser-js/dereference-error'
-    );
-  }
-
-  static isNotSupportedVersion(rawSpec: string): boolean {
-    if (this.notSupportedVersions.test(rawSpec.trim())) {
-      return true;
+  static getRangeForJsonPath(jsonPath: string | Array<string | number>) {
+    try {
+      const extras = this.getParsedExtras();
+      if (extras) {
+        jsonPath = Array.isArray(jsonPath) ? jsonPath : jsonPath.split('/').map(untilde);
+        if (jsonPath[0] === '') jsonPath.shift();
+        return extras.document.getRangeForJsonPath(jsonPath, true);
+      }
+    } catch(err: any) {
+      return;
     }
-    return false;
   }
 }