diff --git a/src/routes/(app)/cloud/[id]/assessments/+page.svelte b/src/routes/(app)/cloud/[id]/assessments/+page.svelte
index 0b12686..9535f57 100644
--- a/src/routes/(app)/cloud/[id]/assessments/+page.svelte
+++ b/src/routes/(app)/cloud/[id]/assessments/+page.svelte
@@ -27,9 +27,7 @@
     }
 
     if (resourceId !== null) {
-      results = results.filter(
-        (r) => r.resourceId.split('/')[r.resourceId.split('/').length - 1] == resourceId
-      );
+      results = results.filter((r) => r.resourceId == resourceId);
     }
 
     return results;
diff --git a/src/routes/(app)/cloud/[id]/resources/+page.svelte b/src/routes/(app)/cloud/[id]/resources/+page.svelte
index 774bf18..a837a31 100644
--- a/src/routes/(app)/cloud/[id]/resources/+page.svelte
+++ b/src/routes/(app)/cloud/[id]/resources/+page.svelte
@@ -131,8 +131,8 @@
     filterOptionsVisible = !filterOptionsVisible;
   }
 
-  function goToAssessmentResults(resourceName: string) {
-    goto(`/cloud/${data.service.id}/assessments/?filterResourceId=${resourceName}`);
+  function goToAssessmentResults(resourceId: string) {
+    goto(`/cloud/${data.service.id}/assessments/?filterResourceId=${resourceId}`);
   }
 
   async function countAssessmentResults(resourceId: string) {
@@ -305,7 +305,7 @@
                       ' for ' +
                       resource.properties.name +
                       '.'}
-                    on:click={() => goToAssessmentResults(resource.properties.name)}
+                    on:click={() => goToAssessmentResults(resource.properties.id)}
                     disabled={assessmentResultCount === 0}
                   >
                     <Icon src={QueueList} class="h-5 w-5 mr-2" />