diff --git a/integration-tests/snapshots/eslint/eslint/report.yaml b/integration-tests/snapshots/eslint/eslint/report.yaml
index df3ea485e4c..0d00a71a3da 100644
--- a/integration-tests/snapshots/eslint/eslint/report.yaml
+++ b/integration-tests/snapshots/eslint/eslint/report.yaml
@@ -22,10 +22,10 @@ issues:
   - "docs/src/_plugins/md-syntax-highlighter.js:4:29         Yuxi    U       Copyright (c) 2019-present, Yuxi (Evan) You"
   - "docs/src/about/index.md:6:87        Zakas       U       created by Nicholas C. Zakas in June 2013. Code"
   - "docs/src/assets/js/components-index.js:17:14        toggleindex     U       function toggleindex(e) {"
-  - "docs/src/assets/js/css-vars-ponyfill%402.js:2:13            ponyfill            U       * css-vars-ponyfill"
-  - "docs/src/assets/js/css-vars-ponyfill%402.js:5:23            Hildenbiddle        U       (c) 2018-2019 John Hildenbiddle <http://hildenbiddle"
-  - "docs/src/assets/js/css-vars-ponyfill%402.js:8:10158         CSSVARSPONYFILL     U       e.comment.indexOf(\"__CSSVARSPONYFILL\")?\"/*\"+e.comment+\"*"
-  - "docs/src/assets/js/css-vars-ponyfill%402.js:8:14683         cssvars             U       e.hasAttribute(\"data-cssvars\"),n=function(e){return"
+  - "docs/src/assets/js/css-vars-ponyfill@2.js:2:13          ponyfill            U       * css-vars-ponyfill"
+  - "docs/src/assets/js/css-vars-ponyfill@2.js:5:23          Hildenbiddle        U       (c) 2018-2019 John Hildenbiddle <http://hildenbiddle"
+  - "docs/src/assets/js/css-vars-ponyfill@2.js:8:10158       CSSVARSPONYFILL     U       e.comment.indexOf(\"__CSSVARSPONYFILL\")?\"/*\"+e.comment+\"*"
+  - "docs/src/assets/js/css-vars-ponyfill@2.js:8:14683       cssvars             U       e.hasAttribute(\"data-cssvars\"),n=function(e){return"
   - "docs/src/assets/js/focus-visible.js:26:5        datetime    U       datetime: true,"
   - "docs/src/assets/js/focus-visible.js:31:46       iframes     U       legacy browsers and iframes which sometimes focus"
   - "docs/src/assets/js/main.js:105:51       togglenav       U       addEventListener(\"click\", togglenav, false);"
diff --git a/integration-tests/snapshots/ktaranov/sqlserver-kit/report.yaml b/integration-tests/snapshots/ktaranov/sqlserver-kit/report.yaml
index 8e192e81b09..ae9ad90b5f0 100644
--- a/integration-tests/snapshots/ktaranov/sqlserver-kit/report.yaml
+++ b/integration-tests/snapshots/ktaranov/sqlserver-kit/report.yaml
@@ -2772,9 +2772,9 @@ issues:
   - "Stored_Procedure/dbo.sp_FailedLogins.sql:28:1           Logdate         U       Logdate Datetime,"
   - "Stored_Procedure/dbo.sp_FailedLogins.sql:29:1           Processinfo     U       Processinfo Varchar(30),"
   - "Stored_Procedure/dbo.sp_FailedLogins.sql:39:1           Latestdate      U       Latestdate.LastError"
-  - "Stored_Procedure/dbo.sp_foreign_key%24batch_drop_and_recreate.sql:25:26         drsql           U       17 Louis Davidson - drsql.org"
-  - "Stored_Procedure/dbo.sp_foreign_key%24batch_drop_and_recreate.sql:129:117       resore          U       where the objects to resore are stored',1;"
-  - "Stored_Procedure/dbo.sp_foreign_key%24batch_drop_and_recreate.sql:143:52        codelocation    U       @trustedFlag BIT, @codelocation VARCHAR(200), @statement"
+  - "Stored_Procedure/dbo.sp_foreign_key$batch_drop_and_recreate.sql:25:26       drsql           U       17 Louis Davidson - drsql.org"
+  - "Stored_Procedure/dbo.sp_foreign_key$batch_drop_and_recreate.sql:129:117     resore          U       where the objects to resore are stored',1;"
+  - "Stored_Procedure/dbo.sp_foreign_key$batch_drop_and_recreate.sql:143:52      codelocation    U       @trustedFlag BIT, @codelocation VARCHAR(200), @statement"
   - "Stored_Procedure/dbo.sp_generate_merge.sql:26:3         ommit                   U       @ommit_images bit = 0, -- Use"
   - "Stored_Procedure/dbo.sp_generate_merge.sql:78:2         Divya                   U       Divya Kalra -- For beta testing"
   - "Stored_Procedure/dbo.sp_generate_merge.sql:78:8         Kalra                   U       Divya Kalra -- For beta testing"
diff --git a/integration-tests/snapshots/sveltejs/svelte/report.yaml b/integration-tests/snapshots/sveltejs/svelte/report.yaml
index aa8658521b4..4c6d16e431e 100644
--- a/integration-tests/snapshots/sveltejs/svelte/report.yaml
+++ b/integration-tests/snapshots/sveltejs/svelte/report.yaml
@@ -2928,80 +2928,80 @@ issues:
   - "sites/svelte.dev/src/routes/_components/WhosUsingSvelte/companies.js:78:9           Razorpay            U       alt: 'Razorpay logo',"
   - "sites/svelte.dev/src/routes/_components/WhosUsingSvelte/companies.js:105:14         transloadit         U       filename: 'transloadit.svg',"
   - "sites/svelte.dev/src/routes/_components/WhosUsingSvelte/companies.js:106:9          Transloadit         U       alt: 'Transloadit',"
-  - "sites/svelte.dev/src/routes/(authed)/apps/%2Bpage.svelte:112:32         delection       U       aria-label=\"Select for delection\""
-  - "sites/svelte.dev/src/routes/%2Bpage.svelte:6:9          Whos                U       import WhosUsingSvelte from './"
-  - "sites/svelte.dev/src/routes/%2Bpage.svelte:81:13        opencollective      U       title: 'opencollective',"
-  - "sites/svelte.dev/src/routes/blog/%2Bpage.svelte:23:31       pubdate     U       article class=\"post\" data-pubdate={post.date}>"
-  - "sites/svelte.dev/src/routes/blog/[slug]/%2Bpage.svelte:64:3         standfirst      U       .standfirst {"
-  - "sites/svelte.dev/src/routes/blog/rss.xml/%2Bserver.js:8:16          Pubdate     U       function formatPubdate(str) {"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:6:12        accusamus           U       title: 'accusamus beatae ad facilis cum"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:6:22        beatae              U       title: 'accusamus beatae ad facilis cum similique"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:6:32        facilis             U       accusamus beatae ad facilis cum similique qui sunt"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:6:44        similique           U       beatae ad facilis cum similique qui sunt',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:6:58        sunt                U       facilis cum similique qui sunt',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:10:12       reprehenderit       U       title: 'reprehenderit est deserunt velit ipsam"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:10:30       deserunt            U       'reprehenderit est deserunt velit ipsam',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:10:39       velit               U       reprehenderit est deserunt velit ipsam',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:10:45       ipsam               U       rehenderit est deserunt velit ipsam',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:14:12       officia             U       title: 'officia porro iure quia iusto"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:14:20       porro               U       title: 'officia porro iure quia iusto qui"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:14:26       iure                U       title: 'officia porro iure quia iusto qui ipsa"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:14:36       iusto               U       officia porro iure quia iusto qui ipsa ut modi',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:14:46       ipsa                U       iure quia iusto qui ipsa ut modi',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:18:18       odio                U       title: 'culpa odio esse rerum omnis laboriosam"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:18:28       rerum               U       title: 'culpa odio esse rerum omnis laboriosam voluptate"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:18:34       omnis               U       culpa odio esse rerum omnis laboriosam voluptate"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:18:40       laboriosam          U       odio esse rerum omnis laboriosam voluptate repudiandae"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:18:51       voluptate           U       rerum omnis laboriosam voluptate repudiandae',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:18:61       repudiandae         U       laboriosam voluptate repudiandae',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:22:12       natus               U       title: 'natus nisi omnis corporis"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:22:29       corporis            U       title: 'natus nisi omnis corporis facere molestiae rerum"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:22:38       facere              U       nisi omnis corporis facere molestiae rerum in'"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:22:45       molestiae           U       omnis corporis facere molestiae rerum in',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:26:25       aliquid             U       title: 'accusamus ea aliquid et amet sequi nemo'"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:26:36       amet                U       accusamus ea aliquid et amet sequi nemo',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:26:41       sequi               U       accusamus ea aliquid et amet sequi nemo',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:26:47       nemo                U       aliquid et amet sequi nemo',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:30:20       delectus            U       title: 'officia delectus consequatur vero aut"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:30:29       consequatur         U       title: 'officia delectus consequatur vero aut veniam explicabo"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:30:41       vero                U       delectus consequatur vero aut veniam explicabo"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:30:50       veniam              U       consequatur vero aut veniam explicabo molestias"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:30:57       explicabo           U       consequatur vero aut veniam explicabo molestias',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:30:67       molestias           U       aut veniam explicabo molestias',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:34:22       officiis            U       title: 'aut porro officiis laborum odit ea laudantium"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:34:31       laborum             U       'aut porro officiis laborum odit ea laudantium corporis"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:34:39       odit                U       porro officiis laborum odit ea laudantium corporis"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:34:47       laudantium          U       officiis laborum odit ea laudantium corporis',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:38:16       eius                U       title: 'qui eius qui autem sed',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:38:25       autem               U       title: 'qui eius qui autem sed',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:50:12       mollitia            U       title: 'mollitia soluta ut rerum eos"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:50:21       soluta              U       title: 'mollitia soluta ut rerum eos aliquam"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:50:41       aliquam             U       soluta ut rerum eos aliquam consequatur perspiciatis"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:50:61       perspiciatis        U       aliquam consequatur perspiciatis maiores',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:50:74       maiores             U       consequatur perspiciatis maiores',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:54:30       deleniti            U       'repudiandae iusto deleniti rerum',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:58:16       necessitatibus      U       title: 'est necessitatibus architecto ut laborum"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:58:31       architecto          U       'est necessitatibus architecto ut laborum',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:62:12       harum               U       title: 'harum dicta similique quis"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:62:34       quis                U       harum dicta similique quis dolore earum ex qui"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:62:39       dolore              U       dicta similique quis dolore earum ex qui',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:62:46       earum               U       similique quis dolore earum ex qui',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:66:23       nobis               U       title: 'iusto sunt nobis quasi veritatis quas"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:66:35       veritatis           U       iusto sunt nobis quasi veritatis quas expedita voluptatum"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:66:45       quas                U       nobis quasi veritatis quas expedita voluptatum"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:66:50       expedita            U       quasi veritatis quas expedita voluptatum deserunt"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:66:59       voluptatum          U       veritatis quas expedita voluptatum deserunt',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:70:18       doloribus           U       title: 'natus doloribus necessitatibus ipsa"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:74:50       illum               U       nam necessitatibus et illum dolores reiciendis'"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:74:64       reiciendis          U       cessitatibus et illum dolores reiciendis',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:78:12       perferendis         U       title: 'perferendis nesciunt eveniet et"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:78:24       nesciunt            U       title: 'perferendis nesciunt eveniet et optio a'"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:78:33       eveniet             U       perferendis nesciunt eveniet et optio a',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:78:44       optio               U       nesciunt eveniet et optio a',"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:82:12       assumenda           U       title: 'assumenda voluptatem laboriosam"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:82:22       voluptatem          U       title: 'assumenda voluptatem laboriosam enim consequatur"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:82:44       enim                U       voluptatem laboriosam enim consequatur veniam placeat"
-  - "sites/svelte.dev/src/routes/tutorial/api/album/%2Bserver.js:82:68       placeat             U       enim consequatur veniam placeat reiciendis error',"
+  - "sites/svelte.dev/src/routes/(authed)/apps/+page.svelte:112:32       delection       U       aria-label=\"Select for delection\""
+  - "sites/svelte.dev/src/routes/+page.svelte:6:9            Whos                U       import WhosUsingSvelte from './"
+  - "sites/svelte.dev/src/routes/+page.svelte:81:13          opencollective      U       title: 'opencollective',"
+  - "sites/svelte.dev/src/routes/blog/+page.svelte:23:31         pubdate     U       article class=\"post\" data-pubdate={post.date}>"
+  - "sites/svelte.dev/src/routes/blog/[slug]/+page.svelte:64:3           standfirst      U       .standfirst {"
+  - "sites/svelte.dev/src/routes/blog/rss.xml/+server.js:8:16        Pubdate     U       function formatPubdate(str) {"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:6:12          accusamus           U       title: 'accusamus beatae ad facilis cum"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:6:22          beatae              U       title: 'accusamus beatae ad facilis cum similique"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:6:32          facilis             U       accusamus beatae ad facilis cum similique qui sunt"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:6:44          similique           U       beatae ad facilis cum similique qui sunt',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:6:58          sunt                U       facilis cum similique qui sunt',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:10:12         reprehenderit       U       title: 'reprehenderit est deserunt velit ipsam"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:10:30         deserunt            U       'reprehenderit est deserunt velit ipsam',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:10:39         velit               U       reprehenderit est deserunt velit ipsam',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:10:45         ipsam               U       rehenderit est deserunt velit ipsam',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:14:12         officia             U       title: 'officia porro iure quia iusto"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:14:20         porro               U       title: 'officia porro iure quia iusto qui"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:14:26         iure                U       title: 'officia porro iure quia iusto qui ipsa"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:14:36         iusto               U       officia porro iure quia iusto qui ipsa ut modi',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:14:46         ipsa                U       iure quia iusto qui ipsa ut modi',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:18:18         odio                U       title: 'culpa odio esse rerum omnis laboriosam"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:18:28         rerum               U       title: 'culpa odio esse rerum omnis laboriosam voluptate"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:18:34         omnis               U       culpa odio esse rerum omnis laboriosam voluptate"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:18:40         laboriosam          U       odio esse rerum omnis laboriosam voluptate repudiandae"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:18:51         voluptate           U       rerum omnis laboriosam voluptate repudiandae',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:18:61         repudiandae         U       laboriosam voluptate repudiandae',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:22:12         natus               U       title: 'natus nisi omnis corporis"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:22:29         corporis            U       title: 'natus nisi omnis corporis facere molestiae rerum"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:22:38         facere              U       nisi omnis corporis facere molestiae rerum in'"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:22:45         molestiae           U       omnis corporis facere molestiae rerum in',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:26:25         aliquid             U       title: 'accusamus ea aliquid et amet sequi nemo'"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:26:36         amet                U       accusamus ea aliquid et amet sequi nemo',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:26:41         sequi               U       accusamus ea aliquid et amet sequi nemo',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:26:47         nemo                U       aliquid et amet sequi nemo',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:30:20         delectus            U       title: 'officia delectus consequatur vero aut"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:30:29         consequatur         U       title: 'officia delectus consequatur vero aut veniam explicabo"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:30:41         vero                U       delectus consequatur vero aut veniam explicabo"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:30:50         veniam              U       consequatur vero aut veniam explicabo molestias"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:30:57         explicabo           U       consequatur vero aut veniam explicabo molestias',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:30:67         molestias           U       aut veniam explicabo molestias',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:34:22         officiis            U       title: 'aut porro officiis laborum odit ea laudantium"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:34:31         laborum             U       'aut porro officiis laborum odit ea laudantium corporis"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:34:39         odit                U       porro officiis laborum odit ea laudantium corporis"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:34:47         laudantium          U       officiis laborum odit ea laudantium corporis',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:38:16         eius                U       title: 'qui eius qui autem sed',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:38:25         autem               U       title: 'qui eius qui autem sed',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:50:12         mollitia            U       title: 'mollitia soluta ut rerum eos"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:50:21         soluta              U       title: 'mollitia soluta ut rerum eos aliquam"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:50:41         aliquam             U       soluta ut rerum eos aliquam consequatur perspiciatis"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:50:61         perspiciatis        U       aliquam consequatur perspiciatis maiores',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:50:74         maiores             U       consequatur perspiciatis maiores',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:54:30         deleniti            U       'repudiandae iusto deleniti rerum',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:58:16         necessitatibus      U       title: 'est necessitatibus architecto ut laborum"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:58:31         architecto          U       'est necessitatibus architecto ut laborum',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:62:12         harum               U       title: 'harum dicta similique quis"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:62:34         quis                U       harum dicta similique quis dolore earum ex qui"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:62:39         dolore              U       dicta similique quis dolore earum ex qui',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:62:46         earum               U       similique quis dolore earum ex qui',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:66:23         nobis               U       title: 'iusto sunt nobis quasi veritatis quas"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:66:35         veritatis           U       iusto sunt nobis quasi veritatis quas expedita voluptatum"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:66:45         quas                U       nobis quasi veritatis quas expedita voluptatum"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:66:50         expedita            U       quasi veritatis quas expedita voluptatum deserunt"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:66:59         voluptatum          U       veritatis quas expedita voluptatum deserunt',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:70:18         doloribus           U       title: 'natus doloribus necessitatibus ipsa"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:74:50         illum               U       nam necessitatibus et illum dolores reiciendis'"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:74:64         reiciendis          U       cessitatibus et illum dolores reiciendis',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:78:12         perferendis         U       title: 'perferendis nesciunt eveniet et"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:78:24         nesciunt            U       title: 'perferendis nesciunt eveniet et optio a'"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:78:33         eveniet             U       perferendis nesciunt eveniet et optio a',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:78:44         optio               U       nesciunt eveniet et optio a',"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:82:12         assumenda           U       title: 'assumenda voluptatem laboriosam"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:82:22         voluptatem          U       title: 'assumenda voluptatem laboriosam enim consequatur"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:82:44         enim                U       voluptatem laboriosam enim consequatur veniam placeat"
+  - "sites/svelte.dev/src/routes/tutorial/api/album/+server.js:82:68         placeat             U       enim consequatur veniam placeat reiciendis error',"
   - "sites/svelte.dev/static/icons/loading.svg:3:97          dasharray       U       stroke-width=\"3\" stroke-dasharray=\"50.2 50\" />"
   - "sites/svelte.dev/static/icons/loading.svg:4:50          dashoffset      U       attributeName=\"stroke-dashoffset\" values=\"52;0;52\" dur"
   - "sites/svelte.dev/static/whos-using-svelte/1password.svg:1:94        evenodd     U       #051627\" fill-rule=\"evenodd\"><path d=\"M157.258"
diff --git a/integration-tests/src/reporter/reportGenerator.ts b/integration-tests/src/reporter/reportGenerator.ts
index ddf8217b17d..6f7f2821925 100644
--- a/integration-tests/src/reporter/reportGenerator.ts
+++ b/integration-tests/src/reporter/reportGenerator.ts
@@ -47,9 +47,9 @@ export function generateReport(data: ReportData): Report {
     function relative(uri: string) {
         if (uri.startsWith(rootUri)) {
             const r = uri.slice(rootUri.length);
-            return decodeURI(r.startsWith('/') ? r.slice(1) : r);
+            return decodeURIComponent(r.startsWith('/') ? r.slice(1) : r);
         }
-        return decodeURI(uri);
+        return decodeURIComponent(uri);
     }
     issues.forEach((issue) => {
         const uri = issue.uri || '';
diff --git a/packages/cspell-lib/src/lib/textValidation/docValidator.test.ts b/packages/cspell-lib/src/lib/textValidation/docValidator.test.ts
index 81254c97214..88d7af26332 100644
--- a/packages/cspell-lib/src/lib/textValidation/docValidator.test.ts
+++ b/packages/cspell-lib/src/lib/textValidation/docValidator.test.ts
@@ -146,8 +146,9 @@ describe('docValidator', () => {
     );
 
     test.each`
-        filename                                      | maxDuplicateProblems | expectedIssues | expectedRawIssues
-        ${tFix('issues/issue-4811/#local/README.md')} | ${undefined}         | ${[]}          | ${undefined}
+        filename                                         | maxDuplicateProblems | expectedIssues   | expectedRawIssues
+        ${tFix('issues/issue-4811/#local/README.md')}    | ${undefined}         | ${[]}            | ${undefined}
+        ${tFix('issues/issue-4811/#local/version@2.md')} | ${undefined}         | ${['marrkdown']} | ${undefined /* cspell:disable-line */}
     `(
         'checkDocument $filename $maxDuplicateProblems',
         async ({ filename, maxDuplicateProblems, expectedIssues, expectedRawIssues }) => {
diff --git a/packages/cspell/src/app/__snapshots__/app.test.ts.snap b/packages/cspell/src/app/__snapshots__/app.test.ts.snap
index 50d8274f9db..36a73661810 100644
--- a/packages/cspell/src/app/__snapshots__/app.test.ts.snap
+++ b/packages/cspell/src/app/__snapshots__/app.test.ts.snap
@@ -446,11 +446,20 @@ exports[`Validate cli > app 'issue-2998 --language-id' Expect Error: undefined 3
 1/1 ./fix-words.txt"
 `;
 
-exports[`Validate cli > app 'issue-4811' Expect Error: undefined 1`] = `[]`;
+exports[`Validate cli > app 'issue-4811 **/README.md' Expect Error: undefined 1`] = `[]`;
 
-exports[`Validate cli > app 'issue-4811' Expect Error: undefined 2`] = `"error	CSpell: Files checked: 8, Issues found: 0 in 0 files"`;
+exports[`Validate cli > app 'issue-4811 **/README.md' Expect Error: undefined 2`] = `"error	CSpell: Files checked: 2, Issues found: 0 in 0 files"`;
 
-exports[`Validate cli > app 'issue-4811' Expect Error: undefined 3`] = `""`;
+exports[`Validate cli > app 'issue-4811 **/README.md' Expect Error: undefined 3`] = `""`;
+
+exports[`Validate cli > app 'issue-4811' Expect Error: [Function CheckFailed] 1`] = `[]`;
+
+exports[`Validate cli > app 'issue-4811' Expect Error: [Function CheckFailed] 2`] = `
+"log	./#local/version@2.md:3:9 - Unknown word (marrkdown)
+error	CSpell: Files checked: 9, Issues found: 1 in 1 files"
+`;
+
+exports[`Validate cli > app 'issue-4811' Expect Error: [Function CheckFailed] 3`] = `""`;
 
 exports[`Validate cli > app 'issue-4811/#local' Expect Error: undefined 1`] = `[]`;
 
diff --git a/packages/cspell/src/app/app.test.ts b/packages/cspell/src/app/app.test.ts
index 0877ed44233..04d011329d2 100644
--- a/packages/cspell/src/app/app.test.ts
+++ b/packages/cspell/src/app/app.test.ts
@@ -186,7 +186,8 @@ describe('Validate cli', () => {
         ${'typos --show-suggestions'}                  | ${['-r', pathFix('features/typos'), '--no-progress', '--show-suggestions', '**']}              | ${app.CheckFailed} | ${true}  | ${true}  | ${false}
         ${'inline suggest'}                            | ${['-r', pathFix('features/inline-suggest'), '--no-progress', '--show-suggestions', '.']}      | ${app.CheckFailed} | ${true}  | ${true}  | ${false}
         ${'reporter'}                                  | ${['-r', pathFix('features/reporter'), '-c', pathFix('features/reporter/cspell.config.yaml')]} | ${undefined}       | ${false} | ${true}  | ${false}
-        ${'issue-4811'}                                | ${['-r', pIssues('issue-4811'), '--no-progress', '.']}                                         | ${undefined}       | ${true}  | ${false} | ${false}
+        ${'issue-4811 **/README.md'}                   | ${['-r', pIssues('issue-4811'), '--no-progress', '**/README.md']}                              | ${undefined}       | ${true}  | ${false} | ${false}
+        ${'issue-4811'}                                | ${['-r', pIssues('issue-4811'), '--no-progress', '.']}                                         | ${app.CheckFailed} | ${true}  | ${true}  | ${false}
     `('app $msg Expect Error: $errorCheck', async ({ testArgs, errorCheck, eError, eLog, eInfo }: TestCase) => {
         chalk.level = 1;
         const commander = getCommander();
diff --git a/test-fixtures/issues/issue-4811/#local/version@2.md b/test-fixtures/issues/issue-4811/#local/version@2.md
new file mode 100644
index 00000000000..8d16e7c0dca
--- /dev/null
+++ b/test-fixtures/issues/issue-4811/#local/version@2.md
@@ -0,0 +1,3 @@
+# Version 2
+
+This is marrkdown v2.