diff --git a/src/lib/components/DomainTest/DomainTest.svelte b/src/lib/components/DomainTest/DomainTest.svelte
index feeaabb7..47336bfa 100644
--- a/src/lib/components/DomainTest/DomainTest.svelte
+++ b/src/lib/components/DomainTest/DomainTest.svelte
@@ -54,7 +54,7 @@
     $effect(() => {
         if (currentState === 'complete' && previousState === 'testing') {
             const base = import.meta.env.BASE_URL;
-            document.location.href = `${base}${getLocale()}/result/${currentContext.testId}`;
+            document.location.href = `${base}${getLocale()}/result/${currentContext.testId}/`;
             transition('RESET');
         }
     });
diff --git a/src/lib/components/DomainTest/History.svelte b/src/lib/components/DomainTest/History.svelte
index 22cf92b7..9672b456 100644
--- a/src/lib/components/DomainTest/History.svelte
+++ b/src/lib/components/DomainTest/History.svelte
@@ -110,7 +110,7 @@
         {#each paginatedHistory as item}
             <li class={item.overall_result}>
                 <a
-                    href={`${import.meta.env.BASE_URL}${getLocale()}/result/${item.id}`}
+                    href={`${import.meta.env.BASE_URL}${getLocale()}/result/${item.id}/`}
                     onclick={onClickLink}
                 >
                     {formatDate(item.created_at)}
diff --git a/src/lib/components/DomainTest/ResultInfo.svelte b/src/lib/components/DomainTest/ResultInfo.svelte
index 3c1ad6e7..3e93dcd9 100644
--- a/src/lib/components/DomainTest/ResultInfo.svelte
+++ b/src/lib/components/DomainTest/ResultInfo.svelte
@@ -42,15 +42,10 @@
         },
         query: '',
     });
-    const rawData = $derived(data.results);
-    const result = $derived(groupResult(data.results));
-    let showExport = $state(false);
-    let showShare = $state(false);
-    let showURL = $state(false);
-
-    function filterResults() {
+    const result = $derived.by(() => {
+        const newResult = groupResult(data.results);
         const filtered = groupResult(
-            rawData.filter(
+            data.results.filter(
                 (r) =>
                     (filter.levels[r.level] || filter.levels['ALL']) &&
                     (!filter.query.length ||
@@ -60,9 +55,14 @@
             ),
         );
 
-        result.modules = filtered.modules;
-        result.modulesMap = filtered.modulesMap;
-    }
+        newResult.modules = filtered.modules;
+        newResult.modulesMap = filtered.modulesMap;
+
+        return newResult;
+    });
+    let showExport = $state(false);
+    let showShare = $state(false);
+    let showURL = $state(false);
 
     function onCheck({ target }: Event) {
         const { value, checked } = target as HTMLInputElement;
@@ -84,13 +84,10 @@
         if (Object.values(filter.levels).every((v) => !v)) {
             filter.levels['ALL'] = true;
         }
-
-        filterResults();
     }
 
     function onQueryChange({ target }: Event) {
         filter.query = (target as HTMLInputElement).value;
-        filterResults();
     }
 
     function expandAllModules() {