From ed0652a32840e050f121ecf46160efca7f796e60 Mon Sep 17 00:00:00 2001
From: Oliver Stolpe <oliver.stolpe@bih-charite.de>
Date: Fri, 8 Sep 2023 10:55:08 +0200
Subject: [PATCH] feat: adapt filter frontend to case detail variant
 annotations (#1104) (#1122)

---
 cases/tests/test_serializers.py               |  11 +-
 cases/tests/test_views_ajax.py                |   2 +
 .../src/components/CaseDetail/Content.vue     |  64 +-
 .../components/CaseDetail/PaneAnnotations.vue |  65 +-
 cases/vueapp/src/components/CaseDetailApp.vue |  79 +-
 cases/vueapp/src/main.js                      |  46 +-
 .../unit/cases/CaseDetail/Content.spec.js     |  78 +-
 .../commands/generate_result_set.py           |  40 +-
 svs/serializers/queries.py                    |   3 +
 svs/tests/factories.py                        |   1 +
 svs/views/ajax/queries.py                     |   4 +
 svs/views/ajax/user_annos.py                  | 105 +-
 svs/vueapp/src/components/SvFilterApp.vue     |  37 +-
 .../src/components/SvFilterApp/Header.vue     |   2 +-
 .../src/components/SvFilterResultsTable.vue   | 139 ++-
 svs/vueapp/src/stores/svDetails.ts            |  11 +-
 svs/vueapp/src/stores/svQuery.js              |  34 +-
 svs/vueapp/src/stores/svResultSet.ts          |  43 +
 variants/plugins.py                           |  26 +-
 variants/serializers/__init__.py              |   3 +
 variants/tasks.py                             |   4 +-
 .../templates/variants/_details_card.html     |  10 -
 variants/tests/factories.py                   |   1 +
 variants/tests/test_utils.py                  | 898 ++++++++++++++++++
 variants/tests/test_views_api.py              |   2 +
 variants/utils.py                             | 180 +++-
 variants/views/api/__init__.py                | 199 +++-
 variants/vueapp/src/api/variantClient.ts      |   4 +-
 variants/vueapp/src/components/FilterApp.vue  |  51 +-
 .../src/components/FilterApp/Header.vue       |   2 +-
 .../src/components/FilterResultsTable.vue     | 379 +++-----
 variants/vueapp/src/enums.ts                  |  27 +
 variants/vueapp/src/stores/variantQuery.js    |  25 +-
 .../vueapp/src/stores/variantResultSet.ts     |  54 ++
 34 files changed, 2094 insertions(+), 535 deletions(-)
 create mode 100644 variants/tests/test_utils.py

diff --git a/cases/tests/test_serializers.py b/cases/tests/test_serializers.py
index 230f0daa1..7b1adfbf5 100644
--- a/cases/tests/test_serializers.py
+++ b/cases/tests/test_serializers.py
@@ -56,9 +56,12 @@ def testSerializeExisting(self):
 class TestCaseSerializer(TestCase):
     def setUp(self):
         super().setUp()
+        self.maxDiff = None
         self.case = CaseFactory()
-        self.smallvariantqueryresultset = SmallVariantQueryResultSetFactory(case=self.case)
-        self.svqueryresultset = SvQueryResultSetFactory(case=self.case)
+        self.smallvariantqueryresultset = SmallVariantQueryResultSetFactory(
+            case=self.case, smallvariantquery=None
+        )
+        self.svqueryresultset = SvQueryResultSetFactory(case=self.case, svquery=None)
         self.maxDiff = None
 
     def testSerializeExisting(self):
@@ -96,9 +99,9 @@ def testSerializeExisting(self):
             "date_modified": self.smallvariantqueryresultset.date_modified.strftime(TIMEF),
             "end_time": self.smallvariantqueryresultset.end_time.strftime(TIMEF),
             "start_time": self.smallvariantqueryresultset.start_time.strftime(TIMEF),
-            "smallvariantquery": self.smallvariantqueryresultset.smallvariantquery.sodar_uuid,
             "elapsed_seconds": self.smallvariantqueryresultset.elapsed_seconds,
             "result_row_count": self.smallvariantqueryresultset.result_row_count,
+            "case": self.smallvariantqueryresultset.case.sodar_uuid,
         }
         expected["svqueryresultset"] = {
             "sodar_uuid": str(self.svqueryresultset.sodar_uuid),
@@ -106,9 +109,9 @@ def testSerializeExisting(self):
             "date_modified": self.svqueryresultset.date_modified.strftime(TIMEF),
             "end_time": self.svqueryresultset.end_time.strftime(TIMEF),
             "start_time": self.svqueryresultset.start_time.strftime(TIMEF),
-            "svquery": self.svqueryresultset.svquery.sodar_uuid,
             "elapsed_seconds": self.svqueryresultset.elapsed_seconds,
             "result_row_count": self.svqueryresultset.result_row_count,
+            "case": self.svqueryresultset.case.sodar_uuid,
         }
         self.assertDictEqual(serializer.data, expected)
 
diff --git a/cases/tests/test_views_ajax.py b/cases/tests/test_views_ajax.py
index 1f2052967..967b09e79 100644
--- a/cases/tests/test_views_ajax.py
+++ b/cases/tests/test_views_ajax.py
@@ -58,6 +58,7 @@ def test_get(self):
             "smallvariantquery": str(self.smallvariantqueryresultset.smallvariantquery.sodar_uuid),
             "elapsed_seconds": self.smallvariantqueryresultset.elapsed_seconds,
             "result_row_count": self.smallvariantqueryresultset.result_row_count,
+            "case": str(self.case.sodar_uuid),
         }
         expected0_svqueryresultset = {
             "sodar_uuid": str(self.svqueryresultset.sodar_uuid),
@@ -68,6 +69,7 @@ def test_get(self):
             "svquery": str(self.svqueryresultset.svquery.sodar_uuid),
             "elapsed_seconds": self.svqueryresultset.elapsed_seconds,
             "result_row_count": self.svqueryresultset.result_row_count,
+            "case": str(self.case.sodar_uuid),
         }
         expected0 = jsonmatch.compile(
             {
diff --git a/cases/vueapp/src/components/CaseDetail/Content.vue b/cases/vueapp/src/components/CaseDetail/Content.vue
index f12144151..ce1a06828 100644
--- a/cases/vueapp/src/components/CaseDetail/Content.vue
+++ b/cases/vueapp/src/components/CaseDetail/Content.vue
@@ -4,9 +4,21 @@ import { computed, ref } from 'vue'
 import PaneCase from '@cases/components/CaseDetail/PaneCase.vue'
 import PaneQc from '@cases/components/CaseDetail/PaneQc.vue'
 import PaneAnnotations from '@cases/components/CaseDetail/PaneAnnotations.vue'
+import { useRouter } from 'vue-router'
 import { useCaseDetailsStore } from '@cases/stores/caseDetails'
 import GenomeBrowser from '@svs/components/GenomeBrowser.vue'
 
+const router = useRouter()
+
+const props = defineProps({
+  /** The case UUID. */
+  caseUuid: String,
+  currentTab: {
+    type: String,
+    default: 'overview', // keep in sync with Tabs.caseList
+  },
+})
+
 /** Define emits. */
 const emit = defineEmits([
   'addCaseCommentClick',
@@ -26,8 +38,6 @@ const Tabs = Object.freeze({
   browser: 'browser',
 })
 
-const currentTab = ref('overview')
-
 const caseDetailsStore = useCaseDetailsStore()
 
 const annosLoading = computed(
@@ -45,28 +55,25 @@ const annoCount = computed(() => {
 
 /** Update the current tab. */
 const updateCurrentTab = (newValue) => {
-  currentTab.value = newValue
+  router.push({
+    name: 'case-detail-' + newValue,
+    params: { case: caseDetailsStore.caseObj.sodar_uuid },
+  })
 }
-
-defineExpose({
-  currentTab,
-})
 </script>
 
 <template>
   <div
     :class="{
-      'flex-grow-1 d-flex flex-column': currentTab === Tabs.annotation,
+      'flex-grow-1 d-flex flex-column': props.currentTab === Tabs.annotation,
     }"
   >
     <ul class="nav nav-tabs" id="case-tab" role="tablist">
       <li class="nav-item">
         <a
-          class="nav-link active"
-          id="overview-tab"
-          data-toggle="tab"
-          href="#overview"
-          role="tab"
+          class="nav-link"
+          :class="{ active: props.currentTab === Tabs.overview }"
+          role="button"
           @click="updateCurrentTab(Tabs.overview)"
         >
           <i-mdi-account />
@@ -76,10 +83,8 @@ defineExpose({
       <li class="nav-item">
         <a
           class="nav-link"
-          id="qc-tab"
-          data-toggle="tab"
-          href="#qc"
-          role="tab"
+          :class="{ active: props.currentTab === Tabs.qc }"
+          role="button"
           @click="updateCurrentTab(Tabs.qc)"
         >
           <i-mdi-chart-multiple />
@@ -89,10 +94,8 @@ defineExpose({
       <li class="nav-item">
         <a
           class="nav-link"
-          id="annotation-tab"
-          data-toggle="tab"
-          href="#annotation"
-          role="tab"
+          :class="{ active: props.currentTab === Tabs.annotation }"
+          role="button"
           @click="updateCurrentTab(Tabs.annotation)"
         >
           <i-mdi-bookmark-multiple />
@@ -109,10 +112,8 @@ defineExpose({
       <li class="nav-item">
         <a
           class="nav-link"
-          id="browser-tab"
-          data-toggle="tab"
-          href="#browser"
-          role="tab"
+          :class="{ active: props.currentTab === Tabs.browser }"
+          role="button"
           @click="updateCurrentTab(Tabs.browser)"
         >
           <i-mdi-safety-goggles />
@@ -123,7 +124,7 @@ defineExpose({
     </ul>
     <div class="tab-content flex-grow-1 d-flex flex-column" id="cases-content">
       <div
-        v-if="currentTab === Tabs.overview"
+        v-if="props.currentTab === Tabs.overview"
         class="border border-top-0 tab-pane fade show active flex-grow-1 d-flex flex-column"
         id="case-list"
         role="tabpanel"
@@ -142,7 +143,7 @@ defineExpose({
         />
       </div>
       <div
-        v-if="currentTab === Tabs.qc"
+        v-if="props.currentTab === Tabs.qc"
         class="border border-top-0 tab-pane fade show active flex-grow-1 d-flex flex-column"
         id="case-list"
         role="tabpanel"
@@ -150,15 +151,18 @@ defineExpose({
         <PaneQc />
       </div>
       <div
-        v-if="currentTab === Tabs.annotation"
+        v-if="props.currentTab === Tabs.annotation"
         class="border border-top-0 tab-pane fade show active flex-grow-1 d-flex flex-column"
         id="case-list"
         role="tabpanel"
       >
-        <PaneAnnotations />
+        <Suspense>
+          <PaneAnnotations :case-uuid="props.caseUuid" />
+          <template #fallback> Loading ... </template>
+        </Suspense>
       </div>
       <div
-        v-if="currentTab === Tabs.browser"
+        v-if="props.currentTab === Tabs.browser"
         class="border border-top-0 tab-pane fade show active flex-grow-1 d-flex flex-column"
         id="case-list"
         role="tabpanel"
diff --git a/cases/vueapp/src/components/CaseDetail/PaneAnnotations.vue b/cases/vueapp/src/components/CaseDetail/PaneAnnotations.vue
index d1112cc5d..5365dc818 100644
--- a/cases/vueapp/src/components/CaseDetail/PaneAnnotations.vue
+++ b/cases/vueapp/src/components/CaseDetail/PaneAnnotations.vue
@@ -1,11 +1,68 @@
-<script setup></script>
+<script setup>
+import { watch, ref, onMounted, nextTick, onBeforeMount } from 'vue'
+import { useRouter } from 'vue-router'
+import { useCaseDetailsStore } from '@cases/stores/caseDetails'
+import { VariantClient } from '@variants/api/variantClient'
+import {
+  DisplayColumns,
+  DisplayConstraints,
+  DisplayDetails,
+  DisplayFrequencies,
+} from '@variants/enums'
+
+import FilterResultsTable from '@variants/components/FilterResultsTable.vue'
+import SvFilterResultsTable from '@svs/components/SvFilterResultsTable.vue'
+
+const router = useRouter()
+
+const props = defineProps({
+  /** The case UUID. */
+  caseUuid: String,
+})
+
+const caseDetailsStore = useCaseDetailsStore()
+
+/** The details columns to show. */
+const displayDetails = ref(DisplayDetails.Coordinates.value)
+/** The frequency columns to show. */
+const displayFrequency = ref(DisplayFrequencies.GnomadExomes.value)
+/** The constraint columns to show. */
+const displayConstraint = ref(DisplayConstraints.GnomadPli.value)
+/** The additional columns to display. */
+const displayColumns = ref([DisplayColumns.Effect.value])
+
+const showSmallVariantDetails = async (event) => {
+  router.push({
+    name: 'variant-details',
+    params: {
+      row: event.smallvariantresultrow,
+      selectedSection: event.selectedSection ?? null,
+    },
+  })
+}
+
+const showStructuralVariantDetails = async (event) => {
+  router.push({
+    name: 'sv-details',
+    params: {
+      row: event.svresultrow,
+      selectedSection: event.selectedSection ?? null,
+    },
+  })
+}
+</script>
 
 <template>
   <div class="row pt-3 pb-3 flex-grow-1 d-flex flex-column">
     <div class="col flex-grow-1 d-flex flex-column">
-      <h5>User Annotations</h5>
-
-      <p>TODO</p>
+      <h5>Small Variant User Annotations</h5>
+      <FilterResultsTable @variant-selected="showSmallVariantDetails" />
+    </div>
+  </div>
+  <div class="row pt-3 pb-3 flex-grow-1 d-flex flex-column">
+    <div class="col flex-grow-1 d-flex flex-column">
+      <h5>Structural Variant User Annotations</h5>
+      <SvFilterResultsTable @variant-selected="showStructuralVariantDetails" />
     </div>
   </div>
 </template>
diff --git a/cases/vueapp/src/components/CaseDetailApp.vue b/cases/vueapp/src/components/CaseDetailApp.vue
index 543da718b..b3f74ab0d 100644
--- a/cases/vueapp/src/components/CaseDetailApp.vue
+++ b/cases/vueapp/src/components/CaseDetailApp.vue
@@ -3,6 +3,13 @@ import { onMounted, nextTick, ref, watch } from 'vue'
 import { QueryPresetsClient } from '@variants/api/queryPresetsClient'
 import { useCaseListStore } from '@cases/stores/caseList'
 import { useCaseDetailsStore } from '@cases/stores/caseDetails'
+import { useVariantFlagsStore } from '@variants/stores/variantFlags'
+import { useVariantCommentsStore } from '@variants/stores/variantComments'
+import { useVariantAcmgRatingStore } from '@variants/stores/variantAcmgRating'
+import { useVariantResultSetStore } from '@variants/stores/variantResultSet'
+import { useSvResultSetStore } from '@svs/stores/svResultSet'
+import { useSvFlagsStore } from '@svs/stores/svFlags'
+import { useSvCommentsStore } from '@svs/stores/svComments'
 import { overlayShow, overlayMessage } from '@cases/common'
 
 import ModalSelect from '@varfish/components/ModalSelect.vue'
@@ -17,7 +24,12 @@ import Content from '@cases/components/CaseDetail/Content.vue'
 import ModalPedigreeEditor from '@cases/components/ModalPedigreeEditor.vue'
 import ModalTermsEditor from '@cases/components/ModalTermsEditor.vue'
 
-const props = defineProps({ caseUuid: { type: String } })
+const props = defineProps({
+  /** The case UUID. */
+  caseUuid: String,
+  /** The current tab. */
+  currentTab: String,
+})
 
 /** Obtain global application content (as for all entry level components) */
 const appContext = JSON.parse(
@@ -27,18 +39,67 @@ const appContext = JSON.parse(
 
 const caseListStore = useCaseListStore()
 const caseDetailsStore = useCaseDetailsStore()
-
-const refreshStores = () => {
+const variantFlagsStore = useVariantFlagsStore()
+const variantCommentsStore = useVariantCommentsStore()
+const variantAcmgRatingStore = useVariantAcmgRatingStore()
+const variantResultSetStore = useVariantResultSetStore()
+const svResultSetStore = useSvResultSetStore()
+const svFlagsStore = useSvFlagsStore()
+const svCommentsStore = useSvCommentsStore()
+
+const refreshStores = async () => {
   if (
     appContext?.csrf_token &&
     appContext?.project?.sodar_uuid &&
     props?.caseUuid
   ) {
-    caseDetailsStore.initialize(
-      appContext.csrf_token,
-      appContext.project.sodar_uuid,
-      props.caseUuid,
-    )
+    caseDetailsStore
+      .initialize(
+        appContext.csrf_token,
+        appContext.project.sodar_uuid,
+        props.caseUuid,
+      )
+      .then(async () => {
+        variantResultSetStore
+          .initialize(appContext.csrf_token)
+          .then(async () => {
+            await variantResultSetStore.loadResultSetViaCase(
+              caseDetailsStore.caseObj.sodar_uuid,
+            )
+          })
+        svResultSetStore.initialize(appContext.csrf_token).then(async () => {
+          await svResultSetStore.loadResultSetViaCase(
+            caseDetailsStore.caseObj.sodar_uuid,
+          )
+        })
+        await Promise.all([
+          variantFlagsStore.initialize(
+            appContext.csrf_token,
+            appContext.project.sodar_uuid,
+            caseDetailsStore.caseObj.sodar_uuid,
+          ),
+          variantCommentsStore.initialize(
+            appContext.csrf_token,
+            appContext.project.sodar_uuid,
+            caseDetailsStore.caseObj.sodar_uuid,
+          ),
+          variantAcmgRatingStore.initialize(
+            appContext.csrf_token,
+            appContext.project.sodar_uuid,
+            caseDetailsStore.caseObj.sodar_uuid,
+          ),
+          svFlagsStore.initialize(
+            appContext.csrf_token,
+            appContext.project?.sodar_uuid,
+            caseDetailsStore.caseObj.sodar_uuid,
+          ),
+          svCommentsStore.initialize(
+            appContext.csrf_token,
+            appContext.project?.sodar_uuid,
+            caseDetailsStore.caseObj.sodar_uuid,
+          ),
+        ])
+      })
   }
 }
 
@@ -410,6 +471,8 @@ onMounted(() => {
       class="varfish-overlay-wrap position-relative flex-grow-1 d-flex flex-column"
     >
       <Content
+        :case-uuid="props.caseUuid"
+        :current-tab="props.currentTab"
         @edit-case-status-click="handleEditCaseStatusClicked"
         @edit-case-notes-click="handleEditCaseNotesClicked"
         @edit-query-presets-click="handleEditQueryPresetsClicked"
diff --git a/cases/vueapp/src/main.js b/cases/vueapp/src/main.js
index 28df1a7e2..96352d3b6 100644
--- a/cases/vueapp/src/main.js
+++ b/cases/vueapp/src/main.js
@@ -46,27 +46,47 @@ const routes = [
     }),
   },
   {
-    name: 'case-detail',
+    name: 'case-detail-overview',
     path: '/detail/:case',
     component: CaseDetailApp,
     props: (route) => ({
       caseUuid: route.params.case,
+      currentTab: 'overview',
+    }),
+  },
+  {
+    name: 'case-detail-qc',
+    path: '/detail/:case/qc',
+    component: CaseDetailApp,
+    props: (route) => ({
+      caseUuid: route.params.case,
+      currentTab: 'qc',
+    }),
+  },
+  {
+    name: 'case-detail-annotation',
+    path: '/detail/:case/annotation',
+    component: CaseDetailApp,
+    props: (route) => ({
+      caseUuid: route.params.case,
+      currentTab: 'annotation',
+    }),
+  },
+  {
+    name: 'case-detail-browser',
+    path: '/detail/:case/browser',
+    component: CaseDetailApp,
+    props: (route) => ({
+      caseUuid: route.params.case,
+      currentTab: 'browser',
     }),
   },
   {
     name: 'variants-filter',
-    path: '/variants/filter/:case/:query?/:page?/:pageSize?/:orderBy?/:orderDir?/:displayDetails?/:displayFrequency?/:displayConstraint?/:displayColumns?',
+    path: '/variants/filter/:case',
     component: FilterApp,
     props: (route) => ({
       caseUuid: route.params.case,
-      page: Number(route.params.page),
-      pageSize: Number(route.params.pageSize),
-      orderBy: route.params.orderBy,
-      orderDir: route.params.orderDir,
-      displayDetails: Number(route.params.displayDetails) || null,
-      displayFrequency: Number(route.params.displayFrequency) || null,
-      displayConstraint: Number(route.params.displayConstraint) || null,
-      displayColumns: route.params.displayColumns || null,
     }),
   },
   {
@@ -80,14 +100,10 @@ const routes = [
   },
   {
     name: 'svs-filter',
-    path: '/svs/filter/:case/:query?/:page?/:pageSize?/:orderBy?/:orderDir?',
+    path: '/svs/filter/:case',
     component: SvFilterApp,
     props: (route) => ({
       caseUuid: route.params.case,
-      page: Number(route.params.page),
-      pageSize: Number(route.params.pageSize),
-      orderBy: route.params.orderBy,
-      orderDir: route.params.orderDir,
     }),
   },
   {
diff --git a/cases/vueapp/tests/unit/cases/CaseDetail/Content.spec.js b/cases/vueapp/tests/unit/cases/CaseDetail/Content.spec.js
index bc6d1fec3..c5a25e5a0 100644
--- a/cases/vueapp/tests/unit/cases/CaseDetail/Content.spec.js
+++ b/cases/vueapp/tests/unit/cases/CaseDetail/Content.spec.js
@@ -2,7 +2,8 @@
 document.head.appendChild(document.createElement('title'))
 
 import CaseDetailContent from '@cases/components/CaseDetail/Content.vue'
-import { beforeAll, describe, expect, test, vi } from 'vitest'
+import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest'
+import { createRouterMock, injectRouterMock } from 'vue-router-mock'
 
 import caseDetailsStoreData from '../../../data/caseDetailsStoreData.json'
 import { makeWrapper } from '../CaseDetailApp.common'
@@ -13,6 +14,19 @@ describe('CaseDetailContent.vue', () => {
     vi.spyOn(console, 'warn').mockImplementation(vi.fn())
   })
 
+  const router = createRouterMock({
+    spy: {
+      create: (fn) => vi.fn(fn),
+      reset: (spy) => spy.mockReset(),
+    },
+  })
+
+  beforeEach(() => {
+    router.reset()
+    // Inject the mock router
+    injectRouterMock(router)
+  })
+
   test('test with empty data', async () => {
     const wrapper = makeWrapper(CaseDetailContent)
 
@@ -48,10 +62,18 @@ describe('CaseDetailContent.vue', () => {
     expect(wrapper.findAll('a.nav-link').length).toBe(4)
     await wrapper.findAll('a.nav-link')[1].trigger('click')
 
-    expect(wrapper.html()).not.matches(/<pane-case-stub/)
-    expect(wrapper.html()).matches(/<pane-qc-stub/)
-    expect(wrapper.html()).not.matches(/<pane-annotations-stub/)
-    expect(wrapper.html()).not.matches(/<genome-browser-stub/)
+    expect(router.push).toHaveBeenCalledTimes(1)
+    expect(router.push).toHaveBeenCalledWith({
+      name: 'case-detail-qc',
+      params: {
+        case: caseDetailsStoreData.caseObj.sodar_uuid,
+      },
+    })
+
+    // expect(wrapper.html()).not.matches(/<pane-case-stub/)
+    // expect(wrapper.html()).matches(/<pane-qc-stub/)
+    // expect(wrapper.html()).not.matches(/<pane-annotations-stub/)
+    // expect(wrapper.html()).not.matches(/<genome-browser-stub/)
   })
 
   test('test click quality control, then overview', async () => {
@@ -68,6 +90,20 @@ describe('CaseDetailContent.vue', () => {
     await wrapper.findAll('a.nav-link')[1].trigger('click')
     await wrapper.findAll('a.nav-link')[0].trigger('click')
 
+    expect(router.push).toHaveBeenCalledTimes(2)
+    expect(router.push).toHaveBeenCalledWith({
+      name: 'case-detail-qc',
+      params: {
+        case: caseDetailsStoreData.caseObj.sodar_uuid,
+      },
+    })
+    expect(router.push).toHaveBeenCalledWith({
+      name: 'case-detail-overview',
+      params: {
+        case: caseDetailsStoreData.caseObj.sodar_uuid,
+      },
+    })
+
     expect(wrapper.html()).matches(/<pane-case-stub/)
     expect(wrapper.html()).not.matches(/<pane-qc-stub/)
     expect(wrapper.html()).not.matches(/<pane-annotations-stub/)
@@ -87,10 +123,18 @@ describe('CaseDetailContent.vue', () => {
     expect(wrapper.findAll('a.nav-link').length).toBe(4)
     await wrapper.findAll('a.nav-link')[2].trigger('click')
 
-    expect(wrapper.html()).not.matches(/<pane-case-stub/)
-    expect(wrapper.html()).not.matches(/<pane-qc-stub/)
-    expect(wrapper.html()).matches(/<pane-annotations-stub/)
-    expect(wrapper.html()).not.matches(/<genome-browser-stub/)
+    expect(router.push).toHaveBeenCalledTimes(1)
+    expect(router.push).toHaveBeenCalledWith({
+      name: 'case-detail-annotation',
+      params: {
+        case: caseDetailsStoreData.caseObj.sodar_uuid,
+      },
+    })
+
+    // expect(wrapper.html()).not.matches(/<pane-case-stub/)
+    // expect(wrapper.html()).not.matches(/<pane-qc-stub/)
+    // expect(wrapper.html()).matches(/<pane-annotations-stub/)
+    // expect(wrapper.html()).not.matches(/<genome-browser-stub/)
   })
 
   test('test click genome browser', async () => {
@@ -106,9 +150,17 @@ describe('CaseDetailContent.vue', () => {
     expect(wrapper.findAll('a.nav-link').length).toBe(4)
     await wrapper.findAll('a.nav-link')[3].trigger('click')
 
-    expect(wrapper.html()).not.matches(/<pane-case-stub/)
-    expect(wrapper.html()).not.matches(/<pane-qc-stub/)
-    expect(wrapper.html()).not.matches(/<pane-annotations-stub/)
-    expect(wrapper.html()).matches(/<genome-browser-stub/)
+    expect(router.push).toHaveBeenCalledTimes(1)
+    expect(router.push).toHaveBeenCalledWith({
+      name: 'case-detail-browser',
+      params: {
+        case: caseDetailsStoreData.caseObj.sodar_uuid,
+      },
+    })
+
+    // expect(wrapper.html()).not.matches(/<pane-case-stub/)
+    // expect(wrapper.html()).not.matches(/<pane-qc-stub/)
+    // expect(wrapper.html()).not.matches(/<pane-annotations-stub/)
+    // expect(wrapper.html()).matches(/<genome-browser-stub/)
   })
 })
diff --git a/maintenance/management/commands/generate_result_set.py b/maintenance/management/commands/generate_result_set.py
index be62518c1..a744a0f4e 100644
--- a/maintenance/management/commands/generate_result_set.py
+++ b/maintenance/management/commands/generate_result_set.py
@@ -63,14 +63,48 @@ def handle(self, *args, **options):
             msg = "Creating query set for all cases."
 
         self.stdout.write(self.style.NOTICE(msg))
+        msg_warning = None
 
         if options["async"]:
-            count = create_queryresultset(
+            count, fill_count = create_queryresultset(
                 options["case_uuid"], options["project_uuid"], options["all"]
             )
-            msg = f"Done creating {count['smallvariantqueryresultset']} SmallVariantQueryResultSet's and {count['svqueryresultset']} SvQueryResultSet's."
+            msg = "Done creating result sets:"
+            if (
+                count["smallvariantqueryresultset"]
+                or count["svqueryresultset"]
+                or fill_count["small_variants"]
+                or fill_count["structural_variants"]
+            ):
+                msg += f"""
+- SmallVariantQueryResultSets created: {count['smallvariantqueryresultset']}
+- SvQueryResultSets created: {count['svqueryresultset']}
+- User annotations added to SmallVariantQueryResultSets: {fill_count['small_variants']}
+- User annotations added to SvQueryResultSets: {fill_count['structural_variants']}"""
+            else:
+                msg += "\n- Nothing to do."
+            if (
+                fill_count["small_variants_orphaned"]
+                or fill_count["structural_variants_orphaned"]
+                or fill_count["small_variants_no_query_result_set"]
+                or fill_count["structural_variants_no_query_result_set"]
+                or fill_count["small_variants_no_case_result_set"]
+                or fill_count["structural_variants_no_case_result_set"]
+            ):
+                msg_warning = f"""
+WARNING! There are orphaned user annotations or cases or queries without result set:
+- Orphaned small variant user annotations: {fill_count['small_variants_orphaned']}
+- Small variant queries without result set: {fill_count['small_variants_no_query_result_set']}
+- Cases without small variant query result set: {fill_count['small_variants_no_case_result_set']}
+- Orphaned structural variant user annotations: {fill_count['structural_variants_orphaned']}
+- Structural variant queries without result set: {fill_count['structural_variants_no_query_result_set']}
+- Cases without structural variant query result set: {fill_count['structural_variants_no_case_result_set']}""".lstrip()
         else:
-            task_create_queryresultset.delay()
+            task_create_queryresultset.delay(
+                options["case_uuid"], options["project_uuid"], options["all"]
+            )
             msg = "Pushed creating the query set to background."
 
         self.stdout.write(self.style.SUCCESS(msg))
+        if msg_warning:
+            self.stdout.write(self.style.WARNING(msg_warning))
diff --git a/svs/serializers/queries.py b/svs/serializers/queries.py
index 2dea3c0c0..090564bd4 100644
--- a/svs/serializers/queries.py
+++ b/svs/serializers/queries.py
@@ -148,6 +148,8 @@ class SvQueryResultSetSerializer(SODARModelSerializer):
 
     #: UUID of the related query
     svquery = serializers.ReadOnlyField(source="svquery.sodar_uuid")
+    #: UUID of the related case
+    case = serializers.ReadOnlyField(source="case.sodar_uuid")
 
     class Meta:
         model = SvQueryResultSet
@@ -156,6 +158,7 @@ class Meta:
             "date_created",
             "date_modified",
             "svquery",
+            "case",
             "start_time",
             "end_time",
             "elapsed_seconds",
diff --git a/svs/tests/factories.py b/svs/tests/factories.py
index 8b1f58234..d49060834 100644
--- a/svs/tests/factories.py
+++ b/svs/tests/factories.py
@@ -328,6 +328,7 @@ class Meta:
         model = SvQueryResultSet
 
     svquery = factory.SubFactory(SvQueryFactory)
+    case = None
 
     start_time = FuzzyDateTime(timezone.now())
     end_time = factory.LazyAttribute(lambda o: o.start_time + datetime.timedelta(hours=1))
diff --git a/svs/views/ajax/queries.py b/svs/views/ajax/queries.py
index c043461c4..fc56dfc6a 100644
--- a/svs/views/ajax/queries.py
+++ b/svs/views/ajax/queries.py
@@ -83,6 +83,8 @@ def get_project(self, request=None, kwargs=None):
             return svquery.case.project
         elif "svqueryresultset" in kwargs:
             svqueryresultset = SvQueryResultSet.objects.get(sodar_uuid=kwargs["svqueryresultset"])
+            if svqueryresultset.case:
+                return svqueryresultset.case.project
             return svqueryresultset.svquery.case.project
         else:
             raise RuntimeError("Must never happen")
@@ -229,6 +231,8 @@ def get_permission_required(self):
 class SvQueryResultRowPermission(SODARAPIProjectPermission):
     def get_project(self, request=None, kwargs=None):
         svqueryresultrow = SvQueryResultRow.objects.get(sodar_uuid=kwargs["svqueryresultrow"])
+        if svqueryresultrow.svqueryresultset.case:
+            return svqueryresultrow.svqueryresultset.case.project
         return svqueryresultrow.svqueryresultset.svquery.case.project
 
 
diff --git a/svs/views/ajax/user_annos.py b/svs/views/ajax/user_annos.py
index ddd255f2e..b076c4860 100644
--- a/svs/views/ajax/user_annos.py
+++ b/svs/views/ajax/user_annos.py
@@ -1,10 +1,11 @@
 """AJAX views for dealing with user annotations (flags and comments)."""
+import uuid
 
 from iterable_orm import QuerySet
 from projectroles.views_api import SODARAPIGenericProjectMixin, SODARAPIProjectPermission
 from rest_framework.generics import ListCreateAPIView, RetrieveUpdateDestroyAPIView
 
-from svs.models import StructuralVariantComment, StructuralVariantFlags
+from svs.models import StructuralVariantComment, StructuralVariantFlags, SvQueryResultRow
 from svs.serializers.user_annos import (
     StructuralVariantCommentSerializer,
     StructuralVariantFlagsSerializer,
@@ -125,6 +126,32 @@ def get_queryset(self):
             qs = qs.filter(**query_args)
         return qs
 
+    def perform_create(self, serializer):
+        super().perform_create(serializer)
+        case = Case.objects.get(sodar_uuid=self.kwargs["case"])
+
+        if not self.request.data.get("sodar_uuid"):
+            return
+
+        result_row = SvQueryResultRow.objects.get(sodar_uuid=self.request.data.get("sodar_uuid"))
+        result_set = case.svqueryresultset_set.first()
+        try:
+            result_set.svqueryresultrow_set.get(
+                release=serializer.instance.release,
+                chromosome=serializer.instance.chromosome,
+                start=serializer.instance.start,
+                end=serializer.instance.end,
+                sv_type=serializer.instance.sv_type,
+                sv_sub_type=serializer.instance.sv_sub_type,
+            )
+        except SvQueryResultRow.DoesNotExist:
+            result_row.pk = None
+            result_row.sodar_uuid = uuid.uuid4()
+            result_row.svqueryresultset = result_set
+            result_row.save()
+            result_row.svqueryresultset.result_row_count += 1
+            result_row.svqueryresultset.save()
+
 
 class StructuralVariantFlagsRetrieveUpdateDestroyAjaxView(
     SvApiBaseMixin, RetrieveUpdateDestroyAPIView
@@ -140,6 +167,31 @@ def get_queryset(self):
     def get_permission_required(self):
         return "variants.update_data"
 
+    def perform_destroy(self, instance):
+        result_set = instance.case.svqueryresultset_set.first()
+        if result_set:
+            result_row_set = result_set.svqueryresultrow_set.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                sv_type=instance.sv_type,
+                sv_sub_type=instance.sv_sub_type,
+            )
+            comments = StructuralVariantComment.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                sv_type=instance.sv_type,
+                sv_sub_type=instance.sv_sub_type,
+            )
+            if result_row_set.exists() and not comments.exists():
+                result_row_set.first().delete()
+                result_set.result_row_count -= 1
+                result_set.save()
+        super().perform_destroy(instance)
+
 
 class StructuralVariantCommentAjaxMixin(SvApiBaseMixin):
     serializer_class = StructuralVariantCommentSerializer
@@ -178,6 +230,32 @@ def get_queryset(self):
             qs = qs.filter(**query_args)
         return qs
 
+    def perform_create(self, serializer):
+        super().perform_create(serializer)
+        case = Case.objects.get(sodar_uuid=self.kwargs["case"])
+
+        if not self.request.data.get("sodar_uuid"):
+            return
+
+        result_row = SvQueryResultRow.objects.get(sodar_uuid=self.request.data.get("sodar_uuid"))
+        result_set = case.svqueryresultset_set.first()
+        try:
+            result_set.svqueryresultrow_set.get(
+                release=serializer.instance.release,
+                chromosome=serializer.instance.chromosome,
+                start=serializer.instance.start,
+                end=serializer.instance.end,
+                sv_type=serializer.instance.sv_type,
+                sv_sub_type=serializer.instance.sv_sub_type,
+            )
+        except SvQueryResultRow.DoesNotExist:
+            result_row.pk = None
+            result_row.sodar_uuid = uuid.uuid4()
+            result_row.svqueryresultset = result_set
+            result_row.save()
+            result_row.svqueryresultset.result_row_count += 1
+            result_row.svqueryresultset.save()
+
 
 class StructuralVariantCommentRetrieveUpdateDestroyAjaxView(
     SvApiBaseMixin, RetrieveUpdateDestroyAPIView
@@ -192,3 +270,28 @@ def get_queryset(self):
 
     def get_permission_required(self):
         return "variants.update_data"
+
+    def perform_destroy(self, instance):
+        result_set = instance.case.svqueryresultset_set.first()
+        if result_set:
+            result_row_set = result_set.svqueryresultrow_set.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                sv_type=instance.sv_type,
+                sv_sub_type=instance.sv_sub_type,
+            )
+            flags = StructuralVariantFlags.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                sv_type=instance.sv_type,
+                sv_sub_type=instance.sv_sub_type,
+            )
+            if result_row_set.exists() and not flags.exists():
+                result_row_set.first().delete()
+                result_set.result_row_count -= 1
+                result_set.save()
+        super().perform_destroy(instance)
diff --git a/svs/vueapp/src/components/SvFilterApp.vue b/svs/vueapp/src/components/SvFilterApp.vue
index 141adab6b..c4d28f553 100644
--- a/svs/vueapp/src/components/SvFilterApp.vue
+++ b/svs/vueapp/src/components/SvFilterApp.vue
@@ -4,6 +4,7 @@ import { useRouter } from 'vue-router'
 
 import { State } from '@varfish/storeUtils'
 import { useSvQueryStore } from '@svs/stores/svQuery'
+import { useSvResultSetStore } from '@svs/stores/svResultSet'
 import { useCaseDetailsStore } from '@cases/stores/caseDetails'
 import { updateUserSetting } from '@varfish/userSettings'
 import { QueryStates, QueryStateToText } from '@variants/enums'
@@ -17,14 +18,6 @@ import { useSvCommentsStore } from '@svs/stores/svComments'
 const props = defineProps({
   /** The case UUID. */
   caseUuid: String,
-  /** The page. */
-  page: Number,
-  /** The page size. */
-  pageSize: Number,
-  /** The column to order by. */
-  orderBy: String,
-  /** The direction of ordering. */
-  orderDir: String,
 })
 
 const appContext = JSON.parse(
@@ -38,6 +31,7 @@ const svQueryStore = useSvQueryStore()
 const svFlagsStore = useSvFlagsStore()
 const svCommentsStore = useSvCommentsStore()
 const caseDetailsStore = useCaseDetailsStore()
+const svResultSetStore = useSvResultSetStore()
 
 const showDetails = async (event) => {
   router.push({
@@ -127,12 +121,18 @@ const refreshStores = async () => {
       appContext.project?.sodar_uuid,
       caseDetailsStore.caseObj.sodar_uuid,
     ),
-    svQueryStore.initialize(
-      appContext.csrf_token,
-      appContext?.project?.sodar_uuid,
-      props.caseUuid,
-      appContext,
-    ),
+    svQueryStore
+      .initialize(
+        appContext.csrf_token,
+        appContext?.project?.sodar_uuid,
+        props.caseUuid,
+        appContext,
+      )
+      .then(() => {
+        svResultSetStore.initialize(appContext.csrf_token).then(async () => {
+          await svResultSetStore.loadResultSetViaQuery(svQueryStore.queryUuid)
+        })
+      }),
   ])
 }
 
@@ -197,14 +197,7 @@ watch(
       v-if="svQueryStore.queryState === QueryStates.Fetched.value"
       class="flex-grow-1 mb-2"
     >
-      <SvFilterResultsTable
-        :case-obj="svQueryStore.caseObj"
-        @variant-selected="showDetails"
-        :page="props.page"
-        :pageSize="props.pageSize"
-        :orderBy="props.orderBy"
-        :orderDir="props.orderDir"
-      />
+      <SvFilterResultsTable @variant-selected="showDetails" />
     </div>
     <div
       v-else-if="
diff --git a/svs/vueapp/src/components/SvFilterApp/Header.vue b/svs/vueapp/src/components/SvFilterApp/Header.vue
index 8dfee446a..76a93f232 100644
--- a/svs/vueapp/src/components/SvFilterApp/Header.vue
+++ b/svs/vueapp/src/components/SvFilterApp/Header.vue
@@ -84,7 +84,7 @@ watch(
         class="btn btn-secondary"
         @click.prevent="
           router.push({
-            name: 'case-detail',
+            name: 'case-detail-overview',
             params: { case: caseDetailsStore.caseObj.sodar_uuid },
           })
         "
diff --git a/svs/vueapp/src/components/SvFilterResultsTable.vue b/svs/vueapp/src/components/SvFilterResultsTable.vue
index 8f7b4e228..bd91452a3 100644
--- a/svs/vueapp/src/components/SvFilterResultsTable.vue
+++ b/svs/vueapp/src/components/SvFilterResultsTable.vue
@@ -7,26 +7,14 @@ import EasyDataTable from 'vue3-easy-data-table'
 import 'vue3-easy-data-table/dist/style.css'
 
 import { SvClient } from '@svs/api/svClient'
-import { useSvQueryStore } from '@svs/stores/svQuery'
+import { useCaseDetailsStore } from '@cases/stores/caseDetails'
+import { useSvResultSetStore } from '@svs/stores/svResultSet'
 import { useSvFlagsStore, emptyFlagsTemplate } from '@svs/stores/svFlags'
 import { useSvCommentsStore } from '@svs/stores/svComments'
 import { formatLargeInt, displayName } from '@varfish/helpers'
 
 const MAX_GENES = 20
 
-/** Define props. */
-const props = defineProps({
-  caseObj: Object,
-  /** The page. */
-  page: Number,
-  /** The page size. */
-  pageSize: Number,
-  /** The column to order by. */
-  orderBy: String,
-  /** The direction of ordering. */
-  orderDir: String,
-})
-
 /** Define emits. */
 const emit = defineEmits(['variantSelected'])
 
@@ -40,7 +28,8 @@ const showVariantDetails = (sodarUuid, section) => {
 }
 
 // Initialize stores
-const svQueryStore = useSvQueryStore()
+const caseDetailsStore = useCaseDetailsStore()
+const svResultSetStore = useSvResultSetStore()
 const svFlagsStore = useSvFlagsStore()
 const svCommentsStore = useSvCommentsStore()
 
@@ -66,7 +55,9 @@ const tableHeaders = computed(() => {
       sortable: true,
     },
   ]
-  for (const [index, row] of (props.caseObj?.pedigree || []).entries()) {
+  for (const [index, row] of (
+    caseDetailsStore.caseObj?.pedigree || []
+  ).entries()) {
     result.push({
       text: displayName(row.name),
       value: `callInfo.${index}`,
@@ -83,8 +74,8 @@ const tableHeaders = computed(() => {
 
 const callInfosSlots = computed(() => {
   const result = {}
-  for (let i = 0; i < (props.caseObj?.pedigree?.length ?? 0); i++) {
-    result[`item-callInfo.${i}`] = props.caseObj.pedigree[i].name
+  for (let i = 0; i < (caseDetailsStore.caseObj?.pedigree?.length ?? 0); i++) {
+    result[`item-callInfo.${i}`] = caseDetailsStore.caseObj.pedigree[i].name
   }
   return result
 })
@@ -98,11 +89,21 @@ const tableRowsSelected = ref([])
 /** Whether the Vue3EasyDataTable is loading. */
 const tableLoading = ref(false)
 /** The table server options, updated by Vue3EasyDataTable. */
-const tableServerOptions = ref({
-  page: props.page || 1,
-  rowsPerPage: props.pageSize || 50,
-  sortBy: props.orderBy || 'chrom-pos',
-  sortType: props.orderDir || 'asc',
+const tableServerOptions = computed({
+  get() {
+    return {
+      page: svResultSetStore.pageNo || 1,
+      rowsPerPage: svResultSetStore.pageSize || 50,
+      sortBy: svResultSetStore.sortBy || 'chrom-pos',
+      sortType: svResultSetStore.sortType || 'asc',
+    }
+  },
+  set(options) {
+    svResultSetStore.pageNo = options.page
+    svResultSetStore.pageSize = options.rowsPerPage
+    svResultSetStore.sortBy = options.sortBy
+    svResultSetStore.sortType = options.sortType
+  },
 })
 
 /** Return list of genes with symbol. */
@@ -151,7 +152,7 @@ const loadFromServer = async () => {
     row.chromosome = row.chromosome.startsWith('chr')
       ? row.chromosome.slice(3)
       : row.chromosome
-    row.callInfos = (props.caseObj?.pedigree || []).map((member) => {
+    row.callInfos = (caseDetailsStore.caseObj?.pedigree || []).map((member) => {
       return row.payload.call_info[member.name].genotype
     })
     if (!('masked_breakpoints' in row.payload)) {
@@ -170,21 +171,23 @@ const loadFromServer = async () => {
   }
 
   tableLoading.value = true
-  const svClient = new SvClient(svQueryStore.csrfToken)
-  const response = await svClient.listSvQueryResultRow(
-    svQueryStore.queryResultSet.sodar_uuid,
-    {
-      pageNo: tableServerOptions.value.page,
-      pageSize: tableServerOptions.value.rowsPerPage,
-      orderBy:
-        tableServerOptions.value.sortBy === 'chrom-pos'
-          ? 'chromosome_no,start'
-          : tableServerOptions.value.sortBy,
-      orderDir: tableServerOptions.value.sortType,
-    },
-  )
-  tableRows.value = response.results.map((row) => transmogrify(row))
-  tableLoading.value = false
+  const svClient = new SvClient(svResultSetStore.csrfToken)
+  if (svResultSetStore.resultSetUuid) {
+    const response = await svClient.listSvQueryResultRow(
+      svResultSetStore.resultSetUuid,
+      {
+        pageNo: tableServerOptions.value.page,
+        pageSize: tableServerOptions.value.rowsPerPage,
+        orderBy:
+          tableServerOptions.value.sortBy === 'chrom-pos'
+            ? 'chromosome_no,start'
+            : tableServerOptions.value.sortBy,
+        orderDir: tableServerOptions.value.sortType,
+      },
+    )
+    tableRows.value = response.results.map((row) => transmogrify(row))
+    tableLoading.value = false
+  }
 }
 
 const goToLocus = async ({ chromosome, start, end }) => {
@@ -303,53 +306,23 @@ const tableRowClassName = (item, _rowNumber) => {
   return ''
 }
 
-const pushRoute = () => {
-  router.push({
-    name: 'svs-filter',
-    params: {
-      case: svQueryStore.caseUuid,
-      query: svQueryStore.queryResultSet.sodar_uuid,
-      orderBy: tableServerOptions.value.sortBy,
-      orderDir: tableServerOptions.value.sortType,
-      page: tableServerOptions.value.page,
-      pageSize: tableServerOptions.value.rowsPerPage,
-    },
-  })
-}
-
 const appContext = JSON.parse(
   document.getElementById('sodar-ss-app-context').getAttribute('app-context') ||
     '{}',
 )
-onBeforeMount(() => {
-  tableLoading.value = true
-  Promise.all([
-    svFlagsStore.initialize(
-      appContext.csrf_token,
-      appContext.project?.sodar_uuid,
-      svQueryStore.caseUuid,
-    ),
-    svCommentsStore.initialize(
-      appContext.csrf_token,
-      appContext.project?.sodar_uuid,
-      svQueryStore.caseUuid,
-    ),
-  ]).then(() => {
-    tableLoading.value = false
-  })
-})
 
-/** Load data when mounted. */
-onMounted(() => {
-  loadFromServer()
+onBeforeMount(async () => {
+  if (svResultSetStore.resultSetUuid) {
+    await loadFromServer()
+  }
 })
 
-/** Watch changes in tableServerOptions and reload if necessary. */
 watch(
-  tableServerOptions,
+  () => svResultSetStore.resultSetUuid,
   (_newValue, _oldValue) => {
-    pushRoute()
-    loadFromServer()
+    if (_newValue) {
+      loadFromServer()
+    }
   },
   { deep: true },
 )
@@ -366,7 +339,7 @@ watch(
         </div>
         <div class="text-center">
           <span class="btn btn-sm btn-outline-secondary">
-            {{ formatLargeInt(svQueryStore.queryResultSet.result_row_count) }}
+            {{ formatLargeInt(svResultSetStore?.resultSet?.result_row_count) }}
           </span>
         </div>
       </div>
@@ -378,7 +351,7 @@ watch(
         </div>
         <div class="text-center">
           <span class="btn btn-sm btn-outline-secondary">
-            {{ svQueryStore.queryResultSet.elapsed_seconds.toFixed(1) }}s
+            {{ svResultSetStore?.resultSet?.elapsed_seconds.toFixed(1) }}s
           </span>
         </div>
       </div>
@@ -416,11 +389,12 @@ watch(
       v-model:server-options="tableServerOptions"
       table-class-name="customize-table"
       :loading="tableLoading"
-      :server-items-length="svQueryStore.queryResultSet.result_row_count"
+      :server-items-length="svResultSetStore?.resultSet?.result_row_count"
       :body-row-class-name="tableRowClassName"
       :headers="tableHeaders"
       :items="tableRows"
       :rows-items="[20, 50, 200, 1000]"
+      theme-color="#6c757d"
       buttons-pagination
       show-index
     >
@@ -848,6 +822,11 @@ watch(
 </template>
 
 <style>
+.customize-table {
+  --easy-table-border: none;
+  --easy-table-row-border: none;
+}
+
 .positive-row {
   --easy-table-body-row-background-color: #f5c6cb;
 }
diff --git a/svs/vueapp/src/stores/svDetails.ts b/svs/vueapp/src/stores/svDetails.ts
index e713a116e..165566d56 100644
--- a/svs/vueapp/src/stores/svDetails.ts
+++ b/svs/vueapp/src/stores/svDetails.ts
@@ -54,8 +54,15 @@ export const useSvDetailsStore = defineStore('svDetails', () => {
 
     // Fetch new details
     const annonarsClient = new AnnonarsApiClient(csrfToken.value)
-    const hgncIds = svRecord.payload.tx_effects.map((item) => item.gene.hgnc_id)
-    genesInfos.value = await annonarsClient.retrieveGeneInfos(hgncIds)
+    let hgncIds = []
+    for (const txEffect of svRecord.payload.tx_effects) {
+      if (txEffect.gene.hgnc_id) {
+        hgncIds.push(txEffect.gene.hgnc_id)
+      }
+    }
+    if (hgncIds.length) {
+      genesInfos.value = await annonarsClient.retrieveGeneInfos(hgncIds)
+    }
     currentSvRecord.value = svRecord
   }
 
diff --git a/svs/vueapp/src/stores/svQuery.js b/svs/vueapp/src/stores/svQuery.js
index a505006ca..7a6eaa066 100644
--- a/svs/vueapp/src/stores/svQuery.js
+++ b/svs/vueapp/src/stores/svQuery.js
@@ -4,6 +4,7 @@
 
 import { useCaseDetailsStore } from '@cases/stores/caseDetails'
 import { SvClient } from '@svs/api/svClient'
+import { useSvResultSetStore } from '@svs/stores/svResultSet'
 import { State, StoreState } from '@varfish/storeUtils'
 import { apiQueryStateToQueryState, QueryStates } from '@variants/enums'
 import { copy } from '@variants/helpers'
@@ -106,6 +107,8 @@ export const useSvQueryStore = defineStore('svQuery', () => {
 
   /** The caseDetails store */
   const caseDetailsStore = useCaseDetailsStore()
+  /** The variantResultSet store */
+  const svResultSetStore = useSvResultSetStore()
 
   // data passed to `initialize` and store state
 
@@ -133,9 +136,8 @@ export const useSvQueryStore = defineStore('svQuery', () => {
   const querySettings = ref(null)
   /** Details from previous query. */
   const previousQueryDetails = ref(null)
-  /** Result set of query. */
-  const queryResultSet = ref(null)
-
+  /** Uuid of query. */
+  const queryUuid = ref(null)
   // bookkeeping for query and results
   /** Current query state. */
   const queryState = ref(QueryStates.None.value)
@@ -206,20 +208,8 @@ export const useSvQueryStore = defineStore('svQuery', () => {
     if (queryState.value === QueryStates.Finished.value) {
       queryState.value = QueryStates.Fetching.value
       await nextTick()
-      // List the results
-      const responseResultSetList = await svClient.listSvQueryResultSet(
-        svQueryUuid,
-      )
-      if (!responseResultSetList.length) {
-        console.log('ERROR: no results in response')
-      } else if (
-        queryState.value === QueryStates.Fetching.value &&
-        previousQueryDetails.value.sodar_uuid === svQueryUuid
-      ) {
-        // Still fetching the same query; push to query result set.
-        queryResultSet.value = responseResultSetList[0]
-        queryState.value = QueryStates.Fetched.value
-      }
+      await svResultSetStore.loadResultSetViaQuery(svQueryUuid)
+      queryState.value = QueryStates.Fetched.value
       return // break out of loop
     }
 
@@ -341,10 +331,11 @@ export const useSvQueryStore = defineStore('svQuery', () => {
       ),
       // 2. fetch previous query UUID
       fetchPreviousQueryUuid(csrfToken.value, caseUuid.value)
-        .then((queryUuid) => {
-          if (queryUuid) {
+        .then((response) => {
+          if (response) {
+            queryUuid.value = response
             // Retrieve query details and extract query settings.
-            return svClient.retrieveSvQuery(queryUuid)
+            return svClient.retrieveSvQuery(response)
           }
         })
         // 2.1 once we have previous query UUID, fetch query details
@@ -394,7 +385,6 @@ export const useSvQueryStore = defineStore('svQuery', () => {
     querySettingsPresets.value = null
     querySettings.value = null
     previousQueryDetails.value = null
-    queryResultSet.value = null
     queryState.value = QueryStates.None.value
     queryStateMsg.value = null
     queryLogs.value = null
@@ -424,7 +414,7 @@ export const useSvQueryStore = defineStore('svQuery', () => {
     querySettingsPresets,
     querySettings,
     previousQueryDetails,
-    queryResultSet,
+    queryUuid,
     queryState,
     queryStateMsg,
     queryLogs,
diff --git a/svs/vueapp/src/stores/svResultSet.ts b/svs/vueapp/src/stores/svResultSet.ts
index da203fe73..8194af24b 100644
--- a/svs/vueapp/src/stores/svResultSet.ts
+++ b/svs/vueapp/src/stores/svResultSet.ts
@@ -7,6 +7,7 @@ import { ref, reactive } from 'vue'
 
 import { StoreState, State } from '@varfish/storeUtils'
 import { SvClient } from '@svs/api/svClient'
+import { VariantClient } from '@variants/api/variantClient'
 
 export const useSvResultSetStore = defineStore('svResultSet', () => {
   // no store dependencies
@@ -31,6 +32,15 @@ export const useSvResultSetStore = defineStore('svResultSet', () => {
   /** Query of result set, if any. */
   const query = ref<any | null>(null)
 
+  /** Table server option page number. */
+  const tablePageNo = ref<number | null>(null)
+  /** Table server option page size. */
+  const tablePageSize = ref<number | null>(null)
+  /** Table server option to sort column by. */
+  const tableSortBy = ref<any | null>(null)
+  /** Table server option sort asc or desc. */
+  const tableSortType = ref<string | null>(null)
+
   /** Promise for initialization of the store. */
   const initializeRes = ref<Promise<any> | null>(null)
 
@@ -67,6 +77,33 @@ export const useSvResultSetStore = defineStore('svResultSet', () => {
     return initializeRes.value
   }
 
+  const loadResultSetViaQuery = async (queryUuid$: string) => {
+    // Once query is finished, load results, if still for the same query.
+    const svClient = new SvClient(csrfToken.value)
+    const responseResultSetList = await svClient.listSvQueryResultSet(
+      queryUuid$,
+    )
+    if (!responseResultSetList.length) {
+      console.error('ERROR: no results in response')
+    } else {
+      // Still fetching the same query; push to query result set.
+      resultSet.value = responseResultSetList[0]
+      resultSetUuid.value = responseResultSetList[0].sodar_uuid
+    }
+  }
+
+  const loadResultSetViaCase = async (caseUuid$: any) => {
+    // Once query is finished, load results, if still for the same query.
+    const variantClient = new VariantClient(csrfToken.value)
+    const case$ = await variantClient.retrieveCase(caseUuid$)
+    if (case$.svqueryresultset) {
+      resultSet.value = case$.svqueryresultset
+      resultSetUuid.value = case$.svqueryresultset.sodar_uuid
+    } else {
+      console.error('ERROR: no result set in case response')
+    }
+  }
+
   /**
    * Fetch the result set via the given result row UUID.
    */
@@ -123,8 +160,14 @@ export const useSvResultSetStore = defineStore('svResultSet', () => {
     query,
     caseUuid,
     initializeRes,
+    tablePageNo,
+    tablePageSize,
+    tableSortBy,
+    tableSortType,
     // functions
     initialize,
     fetchResultSetViaRow,
+    loadResultSetViaQuery,
+    loadResultSetViaCase,
   }
 })
diff --git a/variants/plugins.py b/variants/plugins.py
index ab314ccac..cdc7defc3 100644
--- a/variants/plugins.py
+++ b/variants/plugins.py
@@ -1,7 +1,6 @@
 """Definition of plugins and plugin points."""
 
 from bgjobs.plugins import BackgroundJobsPluginPoint
-from django.urls import reverse
 from django.utils.functional import lazy
 from djangoplugins.point import PluginPoint
 from projectroles.constants import get_sodar_constants
@@ -223,24 +222,13 @@ def _get_state_bar_html(self, project):
         return "".join(arr)
 
     def _get_action_buttons(self, project):
-        if len({case.release for case in Case.objects.filter(project=project)}) == 1:
-            tpl = """
-            <a href="%s" title="joint filtration " class="btn btn-primary sodar-list-btn sodar-ss-irods-btn">
-              <i class="iconify" data-icon="mdi:filter"></i>
-            </a>
-            """
-            url = reverse("variants:project-cases-filter", kwargs={"project": project.sodar_uuid})
-            return tpl % url
-        else:
-            html = """
-            <span
-              class="btn btn-primary sodar-list-btn sodar-ss-irods-btn disabled"
-              data-toggle="tooltip"
-              title="Different references in project; joint filtration impossible.">
-              <i class="iconify" data-icon="mdi:filter"></i>
-            </span>
-            """
-            return html
+        return """
+        <span
+          class="btn btn-primary sodar-list-btn sodar-ss-irods-btn disabled"
+          title="Currently unavailable.">
+          <i class="iconify" data-icon="mdi:filter"></i>
+        </span>
+        """
 
     def get_statistics(self):
         return {
diff --git a/variants/serializers/__init__.py b/variants/serializers/__init__.py
index 42bc7460e..3556dc16d 100644
--- a/variants/serializers/__init__.py
+++ b/variants/serializers/__init__.py
@@ -383,6 +383,8 @@ class SmallVariantQueryResultSetSerializer(SODARModelSerializer):
 
     #: UUID of the related query
     smallvariantquery = serializers.ReadOnlyField(source="smallvariantquery.sodar_uuid")
+    #: UUID of the related case
+    case = serializers.ReadOnlyField(source="case.sodar_uuid")
 
     class Meta:
         model = SmallVariantQueryResultSet
@@ -391,6 +393,7 @@ class Meta:
             "date_created",
             "date_modified",
             "smallvariantquery",
+            "case",
             "start_time",
             "end_time",
             "elapsed_seconds",
diff --git a/variants/tasks.py b/variants/tasks.py
index f2978e601..e8f9f4750 100644
--- a/variants/tasks.py
+++ b/variants/tasks.py
@@ -65,8 +65,8 @@ def clear_expired_exported_files(_self):
 
 
 @app.task(bind=True)
-def create_queryresultset(_self):
-    utils.create_queryresultset()
+def create_queryresultset(_self, case_uuid, project_uuid, all_):
+    utils.create_queryresultset(case_uuid, project_uuid, all_)
 
 
 @app.task(bind=True)
diff --git a/variants/templates/variants/_details_card.html b/variants/templates/variants/_details_card.html
index bf7302496..b880c83b6 100644
--- a/variants/templates/variants/_details_card.html
+++ b/variants/templates/variants/_details_card.html
@@ -27,16 +27,6 @@
             <span class="iconify" data-icon="mdi:format-list-bulleted-square" data-inline="false"></span> See list of all cases
           </a>
           {% same_release cases as project_cases_same_release %}
-          {% if project_cases_same_release %}
-            <a href="{% url 'variants:project-cases-filter' project=project.sodar_uuid %}" class="float-right btn btn-primary btn-small">
-              <i class="iconify" data-icon="mdi:filter"></i> Joint Filtration
-            </a>
-          {% else %}
-            <a class="btn btn-primary disabled" data-toggle="tooltip" title="Joint filtration impossible, different genomes in project.">
-              <i class="iconify" data-icon="mdi:filter"></i>
-              Joint Filtration
-            </a>
-          {% endif %}
         </td>
       </tr>
     {% else %}
diff --git a/variants/tests/factories.py b/variants/tests/factories.py
index 2bf3491b0..505cc02d9 100644
--- a/variants/tests/factories.py
+++ b/variants/tests/factories.py
@@ -728,6 +728,7 @@ class Meta:
         model = SmallVariantQueryResultSet
 
     smallvariantquery = factory.SubFactory(SmallVariantQueryFactory)
+    case = None
 
     start_time = FuzzyDateTime(timezone.now())
     end_time = factory.LazyAttribute(lambda o: o.start_time + datetime.timedelta(hours=1))
diff --git a/variants/tests/test_utils.py b/variants/tests/test_utils.py
new file mode 100644
index 000000000..533faf776
--- /dev/null
+++ b/variants/tests/test_utils.py
@@ -0,0 +1,898 @@
+"""Tests for ``variants.utils``."""
+
+from test_plus.test import TestCase
+
+from svs.models import SvQueryResultSet
+from svs.tests.factories import (
+    StructuralVariantCommentFactory,
+    StructuralVariantFlagsFactory,
+    SvQueryFactory,
+    SvQueryResultRowFactory,
+    SvQueryResultSetFactory,
+)
+from variants.models import SmallVariantQueryResultSet
+from variants.tests.factories import (
+    AcmgCriteriaRatingFactory,
+    CaseFactory,
+    ProjectFactory,
+    SmallVariantCommentFactory,
+    SmallVariantFlagsFactory,
+    SmallVariantQueryFactory,
+    SmallVariantQueryResultRowFactory,
+    SmallVariantQueryResultSetFactory,
+)
+from variants.utils import create_queryresultset, fill_queryresultset
+
+
+class TestCreateQueryResultSet(TestCase):
+    """Basic tests for the ``SmallVariantFlags`` class."""
+
+    def setUp(self):
+        super().setUp()
+        self.project1 = ProjectFactory()
+        self.project1_case1 = CaseFactory(project=self.project1)
+        self.project1_case2 = CaseFactory(project=self.project1)
+        self.project2 = ProjectFactory()
+        self.project2_case1 = CaseFactory(project=self.project2)
+
+    def test_no_resultset_to_create(self):
+        # Prepare
+        svqueryresultset11 = SvQueryResultSetFactory(case=self.project1_case1, svquery=None)
+        svqueryresultset12 = SvQueryResultSetFactory(case=self.project1_case2, svquery=None)
+        svqueryresultset21 = SvQueryResultSetFactory(case=self.project2_case1, svquery=None)
+        smallvariantqueryresultset11 = SmallVariantQueryResultSetFactory(
+            case=self.project1_case1, smallvariantquery=None
+        )
+        smallvariantqueryresultset12 = SmallVariantQueryResultSetFactory(
+            case=self.project1_case2, smallvariantquery=None
+        )
+        smallvariantqueryresultset21 = SmallVariantQueryResultSetFactory(
+            case=self.project2_case1, smallvariantquery=None
+        )
+
+        # Run
+        count, fill_count = create_queryresultset(all=True)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 0,
+            "smallvariantqueryresultset": 0,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first(), smallvariantqueryresultset11
+        )
+        self.assertEqual(
+            self.project1_case2.smallvariantqueryresultset_set.first(), smallvariantqueryresultset12
+        )
+        self.assertEqual(
+            self.project2_case1.smallvariantqueryresultset_set.first(), smallvariantqueryresultset21
+        )
+        self.assertEqual(self.project1_case1.svqueryresultset_set.first(), svqueryresultset11)
+        self.assertEqual(self.project1_case2.svqueryresultset_set.first(), svqueryresultset12)
+        self.assertEqual(self.project2_case1.svqueryresultset_set.first(), svqueryresultset21)
+
+    def test_create_result_sets_for_case(self):
+        # Run
+        count, fill_count = create_queryresultset(case_uuid=self.project1_case1.sodar_uuid)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 1,
+            "smallvariantqueryresultset": 1,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertFalse(self.project1_case2.smallvariantqueryresultset_set.exists())
+        self.assertFalse(self.project2_case1.smallvariantqueryresultset_set.exists())
+        self.assertEqual(
+            self.project1_case1.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertFalse(self.project1_case2.svqueryresultset_set.exists())
+        self.assertFalse(self.project2_case1.svqueryresultset_set.exists())
+
+    def test_create_small_variant_result_sets_for_case(self):
+        # Prepare
+        svqueryresultset11 = SvQueryResultSetFactory(case=self.project1_case1, svquery=None)
+
+        # Run
+        count, fill_count = create_queryresultset(case_uuid=self.project1_case1.sodar_uuid)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 0,
+            "smallvariantqueryresultset": 1,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertFalse(self.project1_case2.smallvariantqueryresultset_set.exists())
+        self.assertFalse(self.project2_case1.smallvariantqueryresultset_set.exists())
+        self.assertEqual(
+            self.project1_case1.svqueryresultset_set.first(),
+            svqueryresultset11,
+        )
+        self.assertFalse(self.project1_case2.svqueryresultset_set.exists())
+        self.assertFalse(self.project2_case1.svqueryresultset_set.exists())
+
+    def test_create_structural_variant_result_sets_for_case(self):
+        # Prepare
+        smallvariantqueryresultset11 = SmallVariantQueryResultSetFactory(
+            case=self.project1_case1, smallvariantquery=None
+        )
+
+        # Run
+        count, fill_count = create_queryresultset(case_uuid=self.project1_case1.sodar_uuid)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 1,
+            "smallvariantqueryresultset": 0,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first(),
+            smallvariantqueryresultset11,
+        )
+        self.assertFalse(self.project1_case2.smallvariantqueryresultset_set.exists())
+        self.assertFalse(self.project2_case1.smallvariantqueryresultset_set.exists())
+        self.assertEqual(
+            self.project1_case1.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertFalse(self.project1_case2.svqueryresultset_set.exists())
+        self.assertFalse(self.project2_case1.svqueryresultset_set.exists())
+
+    def test_create_result_sets_for_project(self):
+        # Run
+        count, fill_count = create_queryresultset(project_uuid=self.project1.sodar_uuid)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 2,
+            "smallvariantqueryresultset": 2,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertEqual(
+            self.project1_case2.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project1_case2),
+        )
+        self.assertFalse(self.project2_case1.smallvariantqueryresultset_set.exists())
+        self.assertEqual(
+            self.project1_case1.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertEqual(
+            self.project1_case2.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project1_case2),
+        )
+        self.assertFalse(self.project2_case1.svqueryresultset_set.exists())
+
+    def test_create_result_sets_for_project_partly(self):
+        # Prepare
+        svqueryresultset11 = SvQueryResultSetFactory(case=self.project1_case1, svquery=None)
+        smallvariantqueryresultset11 = SmallVariantQueryResultSetFactory(
+            case=self.project1_case1, smallvariantquery=None
+        )
+
+        # Run
+        count, fill_count = create_queryresultset(project_uuid=self.project1.sodar_uuid)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 1,
+            "smallvariantqueryresultset": 1,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first(),
+            smallvariantqueryresultset11,
+        )
+        self.assertEqual(
+            self.project1_case2.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project1_case2),
+        )
+        self.assertFalse(self.project2_case1.smallvariantqueryresultset_set.exists())
+        self.assertEqual(
+            self.project1_case1.svqueryresultset_set.first(),
+            svqueryresultset11,
+        )
+        self.assertEqual(
+            self.project1_case2.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project1_case2),
+        )
+        self.assertFalse(self.project2_case1.svqueryresultset_set.exists())
+
+    def test_create_result_sets_for_all(self):
+        # Run
+        count, fill_count = create_queryresultset(all=True)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 3,
+            "smallvariantqueryresultset": 3,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertEqual(
+            self.project1_case2.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project1_case2),
+        )
+        self.assertEqual(
+            self.project2_case1.smallvariantqueryresultset_set.first(),
+            SmallVariantQueryResultSet.objects.get(case=self.project2_case1),
+        )
+        self.assertEqual(
+            self.project1_case1.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project1_case1),
+        )
+        self.assertEqual(
+            self.project1_case2.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project1_case2),
+        )
+        self.assertEqual(
+            self.project2_case1.svqueryresultset_set.first(),
+            SvQueryResultSet.objects.get(case=self.project2_case1),
+        )
+
+    def test_create_sets_with_annotations_simple(self):
+        # Prepare
+        query = SmallVariantQueryFactory(case=self.project1_case1)
+        result_set = SmallVariantQueryResultSetFactory(case=None, smallvariantquery=query)
+        flag = SmallVariantFlagsFactory(case=self.project1_case1)
+        row = SmallVariantQueryResultRowFactory(
+            smallvariantqueryresultset=result_set,
+            release=flag.release,
+            chromosome=flag.chromosome,
+            start=flag.start,
+            end=flag.end,
+            reference=flag.reference,
+            alternative=flag.alternative,
+        )
+
+        # Run
+        count, fill_count = create_queryresultset(all=True)
+
+        # Set expectations
+        expected_count = {
+            "svqueryresultset": 3,
+            "smallvariantqueryresultset": 3,
+        }
+        expected_fill_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 1,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+
+        # Refresh
+        self.project1_case1.refresh_from_db()
+        self.project1_case2.refresh_from_db()
+        self.project2_case1.refresh_from_db()
+
+        # Assert
+        self.assertEqual(count, expected_count)
+        self.assertEqual(fill_count, expected_fill_count)
+        self.assertNotEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first().smallvariantqueryresultrow_set.first(),
+            row,
+        )
+        self.assertEqual(
+            self.project1_case1.smallvariantqueryresultset_set.first()
+            .smallvariantqueryresultrow_set.first()
+            .payload,
+            row.payload,
+        )
+
+
+class TestFillQueryResultSet(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.case1 = CaseFactory()
+        self.case2 = CaseFactory(project=self.case1.project)
+        self.case3 = CaseFactory()
+
+    def test_nothing_to_fill(self):
+        # Prepare
+        SmallVariantQueryFactory(case=self.case1)
+        result_set = SmallVariantQueryResultSetFactory(case=self.case1, smallvariantquery=None)
+        flag = SmallVariantFlagsFactory(case=self.case1)
+        SmallVariantQueryResultRowFactory(
+            smallvariantqueryresultset=result_set,
+            release=flag.release,
+            chromosome=flag.chromosome,
+            start=flag.start,
+            end=flag.end,
+            reference=flag.reference,
+            alternative=flag.alternative,
+        )
+
+        # Run
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+
+    def test_structural_variants_comments_flags(self):
+        # Prepare
+        query = SvQueryFactory(case=self.case1)
+        query_result_set = SvQueryResultSetFactory(case=None, svquery=query)
+        case_result_set = SvQueryResultSetFactory(case=self.case1, svquery=None)
+        flag1 = StructuralVariantFlagsFactory(case=self.case1)
+        flag2 = StructuralVariantFlagsFactory(case=self.case1)
+        comment = StructuralVariantCommentFactory(
+            case=self.case1,
+            release=flag1.release,
+            chromosome=flag1.chromosome,
+            start=flag1.start,
+            end=flag1.end,
+            sv_type=flag1.sv_type,
+            sv_sub_type=flag1.sv_sub_type,
+        )
+        row1 = SvQueryResultRowFactory(
+            svqueryresultset=query_result_set,
+            release=flag1.release,
+            chromosome=flag1.chromosome,
+            start=flag1.start,
+            end=flag1.end,
+            sv_type=flag1.sv_type,
+            sv_sub_type=flag1.sv_sub_type,
+        )
+        row2 = SvQueryResultRowFactory(
+            svqueryresultset=query_result_set,
+            release=flag2.release,
+            chromosome=flag2.chromosome,
+            start=flag2.start,
+            end=flag2.end,
+            sv_type=flag2.sv_type,
+            sv_sub_type=flag2.sv_sub_type,
+        )
+
+        self.assertEqual(case_result_set.svqueryresultrow_set.count(), 0)
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 2,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.svqueryresultrow_set.count(), 2)
+        self.assertNotEqual(case_result_set.svqueryresultrow_set.all()[0], row1)
+        self.assertEqual(case_result_set.svqueryresultrow_set.all()[0].payload, row1.payload)
+        self.assertNotEqual(case_result_set.svqueryresultrow_set.all()[1], row2)
+        self.assertEqual(case_result_set.svqueryresultrow_set.all()[1].payload, row2.payload)
+
+    def test_structural_variants_orphaned_no_query(self):
+        # Prepare
+        case_result_set = SvQueryResultSetFactory(case=self.case1, svquery=None)
+        flag = StructuralVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 1,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.svqueryresultrow_set.count(), 0)
+
+    def test_structural_variants_orphaned_no_row(self):
+        # Prepare
+        query = SvQueryFactory(case=self.case1)
+        query_result_set = SvQueryResultSetFactory(case=None, svquery=query)
+        case_result_set = SvQueryResultSetFactory(case=self.case1, svquery=None)
+        flag = StructuralVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 1,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.svqueryresultrow_set.count(), 0)
+
+    def test_structural_variants_no_query_result_set(self):
+        # Prepare
+        query = SvQueryFactory(case=self.case1)
+        case_result_set = SvQueryResultSetFactory(case=self.case1, svquery=None)
+        flag = StructuralVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 1,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.svqueryresultrow_set.count(), 0)
+
+    def test_structural_variants_no_case_result_set(self):
+        # Prepare
+        query = SvQueryFactory(case=self.case1)
+        query_result_set = SvQueryResultSetFactory(case=None, svquery=query)
+        flag = StructuralVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Refresh
+        self.case1.refresh_from_db()
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 1,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(self.case1.svqueryresultset_set.count(), 0)
+
+    def test_small_variants_comment_flag_acmg(self):
+        # Prepare
+        query = SmallVariantQueryFactory(case=self.case1)
+        query_result_set = SmallVariantQueryResultSetFactory(case=None, smallvariantquery=query)
+        case_result_set = SmallVariantQueryResultSetFactory(case=self.case1, smallvariantquery=None)
+        flag1 = SmallVariantFlagsFactory(case=self.case1)
+        flag2 = SmallVariantFlagsFactory(case=self.case1)
+        comment = SmallVariantCommentFactory(
+            case=self.case1,
+            release=flag1.release,
+            chromosome=flag1.chromosome,
+            start=flag1.start,
+            end=flag1.end,
+            reference=flag1.reference,
+            alternative=flag1.alternative,
+        )
+        acmg = AcmgCriteriaRatingFactory(
+            case=self.case1,
+            release=flag1.release,
+            chromosome=flag1.chromosome,
+            start=flag1.start,
+            end=flag1.end,
+            reference=flag1.reference,
+            alternative=flag1.alternative,
+        )
+        row1 = SmallVariantQueryResultRowFactory(
+            smallvariantqueryresultset=query_result_set,
+            release=flag1.release,
+            chromosome=flag1.chromosome,
+            start=flag1.start,
+            end=flag1.end,
+            reference=flag1.reference,
+            alternative=flag1.alternative,
+        )
+        row2 = SmallVariantQueryResultRowFactory(
+            smallvariantqueryresultset=query_result_set,
+            release=flag2.release,
+            chromosome=flag2.chromosome,
+            start=flag2.start,
+            end=flag2.end,
+            reference=flag2.reference,
+            alternative=flag2.alternative,
+        )
+
+        self.assertEqual(case_result_set.smallvariantqueryresultrow_set.count(), 0)
+        count = fill_queryresultset(self.case1)
+
+        # Refresh
+        case_result_set.refresh_from_db()
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 2,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.smallvariantqueryresultrow_set.count(), 2)
+        self.assertNotEqual(case_result_set.smallvariantqueryresultrow_set.all()[0], row1)
+        self.assertEqual(
+            case_result_set.smallvariantqueryresultrow_set.all()[0].payload, row1.payload
+        )
+        self.assertNotEqual(case_result_set.smallvariantqueryresultrow_set.all()[1], row2)
+        self.assertEqual(
+            case_result_set.smallvariantqueryresultrow_set.all()[1].payload, row2.payload
+        )
+
+    def test_small_variants_orphaned_no_query(self):
+        # Prepare
+        case_result_set = SmallVariantQueryResultSetFactory(case=self.case1, smallvariantquery=None)
+        flag = SmallVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 1,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.smallvariantqueryresultrow_set.count(), 0)
+
+    def test_small_variants_orphaned_no_row(self):
+        # Prepare
+        query = SmallVariantQueryFactory(case=self.case1)
+        query_result_set = SmallVariantQueryResultSetFactory(case=None, smallvariantquery=query)
+        case_result_set = SmallVariantQueryResultSetFactory(case=self.case1, smallvariantquery=None)
+        flag = SmallVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 1,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.smallvariantqueryresultrow_set.count(), 0)
+
+    def test_small_variants_no_query_result_set(self):
+        # Prepare
+        query = SmallVariantQueryFactory(case=self.case1)
+        case_result_set = SmallVariantQueryResultSetFactory(case=self.case1, smallvariantquery=None)
+        flag = SmallVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 1,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(case_result_set.smallvariantqueryresultrow_set.count(), 0)
+
+    def test_small_variants_no_case_result_set(self):
+        # Prepare
+        query = SmallVariantQueryFactory(case=self.case1)
+        query_result_set = SmallVariantQueryResultSetFactory(case=None, smallvariantquery=query)
+        flag = SmallVariantFlagsFactory(case=self.case1)
+
+        count = fill_queryresultset(self.case1)
+
+        # Refresh
+        self.case1.refresh_from_db()
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 0,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 0,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 1,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(self.case1.smallvariantqueryresultset_set.count(), 0)
+
+    def test_small_and_structural_result_set(self):
+        # Prepare
+        sv_query = SvQueryFactory(case=self.case1)
+        sv_query_result_set = SvQueryResultSetFactory(case=None, svquery=sv_query)
+        sv_case_result_set = SvQueryResultSetFactory(case=self.case1, svquery=None)
+        sv_flag1 = StructuralVariantFlagsFactory(case=self.case1)
+        sv_flag2 = StructuralVariantFlagsFactory(case=self.case1)
+        sv_comment = StructuralVariantCommentFactory(
+            case=self.case1,
+            release=sv_flag1.release,
+            chromosome=sv_flag1.chromosome,
+            start=sv_flag1.start,
+            end=sv_flag1.end,
+            sv_type=sv_flag1.sv_type,
+            sv_sub_type=sv_flag1.sv_sub_type,
+        )
+        sv_row1 = SvQueryResultRowFactory(
+            svqueryresultset=sv_query_result_set,
+            release=sv_flag1.release,
+            chromosome=sv_flag1.chromosome,
+            start=sv_flag1.start,
+            end=sv_flag1.end,
+            sv_type=sv_flag1.sv_type,
+            sv_sub_type=sv_flag1.sv_sub_type,
+        )
+        sv_row2 = SvQueryResultRowFactory(
+            svqueryresultset=sv_query_result_set,
+            release=sv_flag2.release,
+            chromosome=sv_flag2.chromosome,
+            start=sv_flag2.start,
+            end=sv_flag2.end,
+            sv_type=sv_flag2.sv_type,
+            sv_sub_type=sv_flag2.sv_sub_type,
+        )
+        variant_query = SmallVariantQueryFactory(case=self.case1)
+        variant_query_result_set = SmallVariantQueryResultSetFactory(
+            case=None, smallvariantquery=variant_query
+        )
+        variant_case_result_set = SmallVariantQueryResultSetFactory(
+            case=self.case1, smallvariantquery=None
+        )
+        variant_flag1 = SmallVariantFlagsFactory(case=self.case1)
+        variant_flag2 = SmallVariantFlagsFactory(case=self.case1)
+        variant_comment = SmallVariantCommentFactory(
+            case=self.case1,
+            release=variant_flag1.release,
+            chromosome=variant_flag1.chromosome,
+            start=variant_flag1.start,
+            end=variant_flag1.end,
+            reference=variant_flag1.reference,
+            alternative=variant_flag1.alternative,
+        )
+        variant_acmg = AcmgCriteriaRatingFactory(
+            case=self.case1,
+            release=variant_flag1.release,
+            chromosome=variant_flag1.chromosome,
+            start=variant_flag1.start,
+            end=variant_flag1.end,
+            reference=variant_flag1.reference,
+            alternative=variant_flag1.alternative,
+        )
+        variant_row1 = SmallVariantQueryResultRowFactory(
+            smallvariantqueryresultset=variant_query_result_set,
+            release=variant_flag1.release,
+            chromosome=variant_flag1.chromosome,
+            start=variant_flag1.start,
+            end=variant_flag1.end,
+            reference=variant_flag1.reference,
+            alternative=variant_flag1.alternative,
+        )
+        variant_row2 = SmallVariantQueryResultRowFactory(
+            smallvariantqueryresultset=variant_query_result_set,
+            release=variant_flag2.release,
+            chromosome=variant_flag2.chromosome,
+            start=variant_flag2.start,
+            end=variant_flag2.end,
+            reference=variant_flag2.reference,
+            alternative=variant_flag2.alternative,
+        )
+
+        self.assertEqual(sv_case_result_set.svqueryresultrow_set.count(), 0)
+        self.assertEqual(variant_case_result_set.smallvariantqueryresultrow_set.count(), 0)
+        count = fill_queryresultset(self.case1)
+
+        # Refresh
+        sv_case_result_set.refresh_from_db()
+        variant_case_result_set.refresh_from_db()
+
+        # Set expectations
+        expected_count = {
+            "structural_variants": 2,
+            "structural_variants_orphaned": 0,
+            "structural_variants_no_query_result_set": 0,
+            "structural_variants_no_case_result_set": 0,
+            "small_variants": 2,
+            "small_variants_orphaned": 0,
+            "small_variants_no_query_result_set": 0,
+            "small_variants_no_case_result_set": 0,
+        }
+        self.assertEqual(count, expected_count)
+        self.assertEqual(sv_case_result_set.svqueryresultrow_set.count(), 2)
+        self.assertNotEqual(sv_case_result_set.svqueryresultrow_set.all()[0], sv_row1)
+        self.assertEqual(sv_case_result_set.svqueryresultrow_set.all()[0].payload, sv_row1.payload)
+        self.assertNotEqual(sv_case_result_set.svqueryresultrow_set.all()[1], sv_row2)
+        self.assertEqual(sv_case_result_set.svqueryresultrow_set.all()[1].payload, sv_row2.payload)
+        self.assertEqual(variant_case_result_set.smallvariantqueryresultrow_set.count(), 2)
+        self.assertNotEqual(
+            variant_case_result_set.smallvariantqueryresultrow_set.all()[0], variant_row1
+        )
+        self.assertEqual(
+            variant_case_result_set.smallvariantqueryresultrow_set.all()[0].payload,
+            variant_row1.payload,
+        )
+        self.assertNotEqual(
+            variant_case_result_set.smallvariantqueryresultrow_set.all()[1], variant_row2
+        )
+        self.assertEqual(
+            variant_case_result_set.smallvariantqueryresultrow_set.all()[1].payload,
+            variant_row2.payload,
+        )
diff --git a/variants/tests/test_views_api.py b/variants/tests/test_views_api.py
index 2d645547a..5484d7398 100644
--- a/variants/tests/test_views_api.py
+++ b/variants/tests/test_views_api.py
@@ -66,6 +66,7 @@ def _expected_case_data(self, case=None, legacy=False):
                 "smallvariantquery": self.smallvariantqueryresultset.smallvariantquery.sodar_uuid,
                 "elapsed_seconds": self.smallvariantqueryresultset.elapsed_seconds,
                 "result_row_count": self.smallvariantqueryresultset.result_row_count,
+                "case": self.case.sodar_uuid,
             },
             "svqueryresultset": {
                 "sodar_uuid": str(self.svqueryresultset.sodar_uuid),
@@ -76,6 +77,7 @@ def _expected_case_data(self, case=None, legacy=False):
                 "svquery": self.svqueryresultset.svquery.sodar_uuid,
                 "elapsed_seconds": self.svqueryresultset.elapsed_seconds,
                 "result_row_count": self.svqueryresultset.result_row_count,
+                "case": self.case.sodar_uuid,
             },
         }
         if legacy:
diff --git a/variants/utils.py b/variants/utils.py
index d18ced4e9..e5b0f85c0 100644
--- a/variants/utils.py
+++ b/variants/utils.py
@@ -1,7 +1,21 @@
 import importlib
+from itertools import chain
+import uuid
 
-from svs.models import SvQueryResultSet
-from variants.models import Case, SmallVariantQueryResultSet
+from svs.models import (
+    StructuralVariantComment,
+    StructuralVariantFlags,
+    SvQueryResultRow,
+    SvQueryResultSet,
+)
+from variants.models import (
+    AcmgCriteriaRating,
+    Case,
+    SmallVariantComment,
+    SmallVariantFlags,
+    SmallVariantQueryResultRow,
+    SmallVariantQueryResultSet,
+)
 
 
 def class_from_string(dot_path):
@@ -19,12 +33,22 @@ def create_queryresultset(case_uuid=None, project_uuid=None, all=False):
     """Create a SmallVariantQueryResultSet for the given case or project."""
 
     count = {
-        "svqueryresultset": 0,
-        "smallvariantqueryresultset": 0,
+        "svqueryresultset": 0,  # SvQueryResultSet's created
+        "smallvariantqueryresultset": 0,  # SmallVariantQueryResultSet's created
+    }
+    fill_count = {
+        "structural_variants": 0,  # user annotations added to SvQueryResultSet's
+        "structural_variants_orphaned": 0,  # user annotations without corresponding query result row
+        "structural_variants_no_query_result_set": 0,  # query without result set
+        "structural_variants_no_case_result_set": 0,  # case without result set
+        "small_variants": 0,  # user annotations added to SmallVariantQueryResultSet's
+        "small_variants_orphaned": 0,  # user annotations without corresponding query result row
+        "small_variants_no_query_result_set": 0,  # query without result set
+        "small_variants_no_case_result_set": 0,  # case without result set
     }
 
-    def _perform_create(_case, count):
-        if _case.num_small_vars and _case.smallvariantqueryresultset_set.count() == 0:
+    def _perform_create(_case):
+        if _case.smallvariantqueryresultset_set.count() == 0:
             count["smallvariantqueryresultset"] += 1
             SmallVariantQueryResultSet.objects.create(
                 case=_case,
@@ -33,7 +57,7 @@ def _perform_create(_case, count):
                 end_time=_case.date_created,
                 elapsed_seconds=0,
             )
-        if _case.num_svs and _case.svqueryresultset_set.count() == 0:
+        if _case.svqueryresultset_set.count() == 0:
             count["svqueryresultset"] += 1
             SvQueryResultSet.objects.create(
                 case=_case,
@@ -43,16 +67,152 @@ def _perform_create(_case, count):
                 elapsed_seconds=0,
             )
 
+    def _perform_fill(_case):
+        _fill_count = fill_queryresultset(_case)
+        fill_count["structural_variants"] += _fill_count["structural_variants"]
+        fill_count["structural_variants_orphaned"] += _fill_count["structural_variants_orphaned"]
+        fill_count["structural_variants_no_query_result_set"] += _fill_count[
+            "structural_variants_no_query_result_set"
+        ]
+        fill_count["structural_variants_no_case_result_set"] += _fill_count[
+            "structural_variants_no_case_result_set"
+        ]
+        fill_count["small_variants"] += _fill_count["small_variants"]
+        fill_count["small_variants_orphaned"] += _fill_count["small_variants_orphaned"]
+        fill_count["small_variants_no_query_result_set"] += _fill_count[
+            "small_variants_no_query_result_set"
+        ]
+        fill_count["small_variants_no_case_result_set"] += _fill_count[
+            "small_variants_no_case_result_set"
+        ]
+
     if bool(case_uuid) + bool(project_uuid) + bool(all) != 1:
         return
 
     if case_uuid:
-        _perform_create(Case.objects.get(sodar_uuid=case_uuid), count)
+        _case = Case.objects.get(sodar_uuid=case_uuid)
+        _perform_create(_case)
+        _perform_fill(_case)
     elif project_uuid:
         for _case in Case.objects.filter(project__sodar_uuid=project_uuid):
-            _perform_create(_case, count)
+            _perform_create(_case)
+            _perform_fill(_case)
     else:
         for _case in Case.objects.all():
-            _perform_create(_case, count)
+            _perform_create(_case)
+            _perform_fill(_case)
+    return count, fill_count
+
+
+# flake8: noqa: C901
+def fill_queryresultset(case):
+    """Fill a SmallVariantQueryResultSet for the given case or project."""
+
+    count = {
+        "structural_variants": 0,
+        "structural_variants_orphaned": 0,
+        "structural_variants_no_query_result_set": 0,
+        "structural_variants_no_case_result_set": 0,
+        "small_variants": 0,
+        "small_variants_orphaned": 0,
+        "small_variants_no_query_result_set": 0,
+        "small_variants_no_case_result_set": 0,
+    }
+
+    def _perform_create(obj):
+        coords = {
+            "release": obj.release,
+            "chromosome": obj.chromosome,
+            "start": obj.start,
+            "end": obj.end,
+            "reference": obj.reference,
+            "alternative": obj.alternative,
+        }
+        case_result_set = case.smallvariantqueryresultset_set.first()
+
+        if not case_result_set:
+            count["small_variants_no_case_result_set"] += 1
+            return
+
+        try:
+            case_result_set.smallvariantqueryresultrow_set.get(**coords)
+
+        except SmallVariantQueryResultRow.DoesNotExist:
+            queries = case.small_variant_queries.all()
+            if not queries.exists():
+                count["small_variants_orphaned"] += 1
+            for query in queries:
+                query_result_set = query.smallvariantqueryresultset_set.first()
+                if not query_result_set:
+                    count["small_variants_no_query_result_set"] += 1
+                    continue
+                result_row = query_result_set.smallvariantqueryresultrow_set.filter(**coords)
+                if not result_row.exists():
+                    # should exist as it was annotated.
+                    count["small_variants_orphaned"] += 1
+                    continue
+                result_row = result_row.first()
+                result_row.pk = None
+                result_row.sodar_uuid = uuid.uuid4()
+                result_row.smallvariantqueryresultset = case_result_set
+                result_row.save()
+                count["small_variants"] += 1
+
+        case_result_set.result_row_count = case_result_set.smallvariantqueryresultrow_set.count()
+        case_result_set.save()
+
+    def _perform_create_sv(obj):
+        coords = {
+            "release": obj.release,
+            "chromosome": obj.chromosome,
+            "start": obj.start,
+            "end": obj.end,
+            "sv_type": obj.sv_type,
+            "sv_sub_type": obj.sv_sub_type,
+        }
+        case_result_set = case.svqueryresultset_set.first()
+
+        if not case_result_set:
+            count["structural_variants_no_case_result_set"] += 1
+            return
+
+        try:
+            case_result_set.svqueryresultrow_set.get(**coords)
+
+        except SvQueryResultRow.DoesNotExist:
+            queries = case.svquery_set.all()
+            if not queries.exists():
+                count["structural_variants_orphaned"] += 1
+            for query in queries:
+                query_result_set = query.svqueryresultset_set.first()
+                if not query_result_set:
+                    count["structural_variants_no_query_result_set"] += 1
+                    continue
+                result_row = query_result_set.svqueryresultrow_set.filter(**coords)
+                if not result_row.exists():
+                    # should exist as it was annotated.
+                    count["structural_variants_orphaned"] += 1
+                    continue
+                result_row = result_row.first()
+                result_row.pk = None
+                result_row.sodar_uuid = uuid.uuid4()
+                result_row.svqueryresultset = case_result_set
+                result_row.save()
+                count["structural_variants"] += 1
+
+        case_result_set.result_row_count = case_result_set.svqueryresultrow_set.count()
+        case_result_set.save()
+
+    small_variant_flags = SmallVariantFlags.objects.filter(case=case)
+    small_variant_comments = SmallVariantComment.objects.filter(case=case)
+    acmg_rating = AcmgCriteriaRating.objects.filter(case=case)
+    sv_flags = StructuralVariantFlags.objects.filter(case=case)
+    sv_comments = StructuralVariantComment.objects.filter(case=case)
+
+    for obj in chain(small_variant_flags, small_variant_comments, acmg_rating):
+        _perform_create(obj)
+
+    for obj in chain(sv_flags, sv_comments):
+        _perform_create_sv(obj)
 
     return count
diff --git a/variants/views/api/__init__.py b/variants/views/api/__init__.py
index 7e51a5076..66207c189 100644
--- a/variants/views/api/__init__.py
+++ b/variants/views/api/__init__.py
@@ -3,6 +3,7 @@
 from itertools import chain
 import re
 import typing
+import uuid
 
 import attrs
 from bgjobs.models import BackgroundJob
@@ -280,6 +281,8 @@ def get_project(self, request=None, kwargs=None):
             smallvariantqueryresultset = SmallVariantQueryResultSet.objects.get(
                 sodar_uuid=kwargs["smallvariantqueryresultset"]
             )
+            if smallvariantqueryresultset.case:
+                return smallvariantqueryresultset.case.project
             return smallvariantqueryresultset.smallvariantquery.case.project
         else:
             raise RuntimeError("Must never happen")
@@ -458,10 +461,12 @@ def get_permission_required(self):
 
 class SmallVariantQueryResultRowViewPermission(SODARAPIProjectPermission):
     def get_project(self, request=None, kwargs=None):
-        smallvariantqueryresultrow = SmallVariantQueryResultRow.objects.get(
+        result_set = SmallVariantQueryResultRow.objects.get(
             sodar_uuid=kwargs["smallvariantqueryresultrow"]
-        )
-        return smallvariantqueryresultrow.smallvariantqueryresultset.smallvariantquery.case.project
+        ).smallvariantqueryresultset
+        if result_set.case:
+            return result_set.case.project
+        return result_set.smallvariantquery.case.project
 
 
 class SmallVariantQueryResultRowRetrieveApiView(RetrieveAPIView):
@@ -1223,8 +1228,6 @@ class SmallVariantCommentListCreateApiView(
 
     """
 
-    serializer_class = SmallVariantCommentSerializer
-
     def get_serializer_context(self):
         result = super().get_serializer_context()
         result["case"] = Case.objects.get(sodar_uuid=self.kwargs["case"])
@@ -1234,11 +1237,36 @@ def get_serializer_context(self):
                 result[key] = self.request.query_params[key]
         return result
 
+    def perform_create(self, serializer):
+        super().perform_create(serializer)
+        case = Case.objects.get(sodar_uuid=self.kwargs["case"])
 
-class SmallVariantFlagsApiMixin(VariantsApiBaseMixin):
-    lookup_field = "sodar_uuid"
-    lookup_url_kwarg = "case"
+        if not self.request.data.get("sodar_uuid"):
+            return
 
+        result_row = SmallVariantQueryResultRow.objects.get(
+            sodar_uuid=self.request.data.get("sodar_uuid")
+        )
+        result_set = case.smallvariantqueryresultset_set.first()
+        try:
+            result_set.smallvariantqueryresultrow_set.get(
+                release=serializer.instance.release,
+                chromosome=serializer.instance.chromosome,
+                start=serializer.instance.start,
+                end=serializer.instance.end,
+                reference=serializer.instance.reference,
+                alternative=serializer.instance.alternative,
+            )
+        except SmallVariantQueryResultRow.DoesNotExist:
+            result_row.pk = None
+            result_row.sodar_uuid = uuid.uuid4()
+            result_row.smallvariantqueryresultset = result_set
+            result_row.save()
+            result_row.smallvariantqueryresultset.result_row_count += 1
+            result_row.smallvariantqueryresultset.save()
+
+
+class SmallVariantFlagsApiMixin(VariantsApiBaseMixin):
     renderer_classes = [VarfishApiRenderer]
     versioning_class = VarfishApiVersioning
 
@@ -1292,6 +1320,34 @@ def get_serializer_context(self):
                 result[key] = self.request.query_params[key]
         return result
 
+    def perform_create(self, serializer):
+        super().perform_create(serializer)
+        case = Case.objects.get(sodar_uuid=self.kwargs["case"])
+
+        if not self.request.data.get("sodar_uuid"):
+            return
+
+        result_row = SmallVariantQueryResultRow.objects.get(
+            sodar_uuid=self.request.data.get("sodar_uuid")
+        )
+        result_set = case.smallvariantqueryresultset_set.first()
+        try:
+            result_set.smallvariantqueryresultrow_set.get(
+                release=serializer.instance.release,
+                chromosome=serializer.instance.chromosome,
+                start=serializer.instance.start,
+                end=serializer.instance.end,
+                reference=serializer.instance.reference,
+                alternative=serializer.instance.alternative,
+            )
+        except SmallVariantQueryResultRow.DoesNotExist:
+            result_row.pk = None
+            result_row.sodar_uuid = uuid.uuid4()
+            result_row.smallvariantqueryresultset = result_set
+            result_row.save()
+            result_row.smallvariantqueryresultset.result_row_count += 1
+            result_row.smallvariantqueryresultset.save()
+
 
 class SmallVariantFlagsUpdateApiView(
     UpdateAPIView,
@@ -1346,6 +1402,39 @@ class SmallVariantFlagsDeleteApiView(
     def get_permission_required(self):
         return "variants.view_data"
 
+    def perform_destroy(self, instance):
+        result_set = instance.case.smallvariantqueryresultset_set.first()
+        if result_set:
+            result_row_set = result_set.smallvariantqueryresultrow_set.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            comments = SmallVariantComment.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            acmg_ratings = AcmgCriteriaRating.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            if result_row_set.exists() and not comments.exists() and not acmg_ratings.exists():
+                result_row_set.first().delete()
+                result_set.result_row_count -= 1
+                result_set.save()
+        super().perform_destroy(instance)
+
 
 class SmallVariantCommentUpdateApiView(
     UpdateAPIView,
@@ -1403,6 +1492,39 @@ class SmallVariantCommentDeleteApiView(
     def get_permission_required(self):
         return "variants.view_data"
 
+    def perform_destroy(self, instance):
+        result_set = instance.case.smallvariantqueryresultset_set.first()
+        if result_set:
+            result_row_set = result_set.smallvariantqueryresultrow_set.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            flags = SmallVariantFlags.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            acmg_ratings = AcmgCriteriaRating.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            if result_row_set.exists() and not flags.exists() and not acmg_ratings.exists():
+                result_row_set.first().delete()
+                result_set.result_row_count -= 1
+                result_set.save()
+        super().perform_destroy(instance)
+
 
 class AcmgCriteriaRatingApiMixin(VariantsApiBaseMixin):
     lookup_field = "sodar_uuid"
@@ -1471,6 +1593,34 @@ def get_serializer_context(self):
                 result[key] = self.request.query_params[key]
         return result
 
+    def perform_create(self, serializer):
+        super().perform_create(serializer)
+        case = Case.objects.get(sodar_uuid=self.kwargs["case"])
+
+        if not self.request.data.get("sodar_uuid"):
+            return
+
+        result_row = SmallVariantQueryResultRow.objects.get(
+            sodar_uuid=self.request.data.get("sodar_uuid")
+        )
+        result_set = case.smallvariantqueryresultset_set.first()
+        try:
+            result_set.smallvariantqueryresultrow_set.get(
+                release=serializer.instance.release,
+                chromosome=serializer.instance.chromosome,
+                start=serializer.instance.start,
+                end=serializer.instance.end,
+                reference=serializer.instance.reference,
+                alternative=serializer.instance.alternative,
+            )
+        except SmallVariantQueryResultRow.DoesNotExist:
+            result_row.pk = None
+            result_row.sodar_uuid = uuid.uuid4()
+            result_row.smallvariantqueryresultset = result_set
+            result_row.save()
+            result_row.smallvariantqueryresultset.result_row_count += 1
+            result_row.smallvariantqueryresultset.save()
+
 
 class AcmgCriteriaRatingUpdateApiView(
     UpdateAPIView,
@@ -1525,6 +1675,39 @@ class AcmgCriteriaRatingDeleteApiView(
     def get_permission_required(self):
         return "variants.view_data"
 
+    def perform_destroy(self, instance):
+        result_set = instance.case.smallvariantqueryresultset_set.first()
+        if result_set:
+            result_row_set = result_set.smallvariantqueryresultrow_set.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            flags = SmallVariantFlags.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            comments = SmallVariantComment.objects.filter(
+                release=instance.release,
+                chromosome=instance.chromosome,
+                start=instance.start,
+                end=instance.end,
+                reference=instance.reference,
+                alternative=instance.alternative,
+            )
+            if result_row_set.exists() and not flags.exists() and not comments.exists():
+                result_row_set.first().delete()
+                result_set.result_row_count -= 1
+                result_set.save()
+        super().perform_destroy(instance)
+
 
 class ExtraAnnoFieldsApiView(
     ListAPIView,
diff --git a/variants/vueapp/src/api/variantClient.ts b/variants/vueapp/src/api/variantClient.ts
index c80a233bd..99652c987 100644
--- a/variants/vueapp/src/api/variantClient.ts
+++ b/variants/vueapp/src/api/variantClient.ts
@@ -111,10 +111,10 @@ export class VariantClient extends ClientBase {
   }
 
   async retrieveQueryResultSet(
-    queryResultUuid: string,
+    queryResultSetUuid: string,
   ): Promise<QueryResultSet> {
     return await this.fetchHelper(
-      `/variants/ajax/query-result-set/retrieve/${queryResultUuid}/`,
+      `/variants/ajax/query-result-set/retrieve/${queryResultSetUuid}/`,
       'GET',
     )
   }
diff --git a/variants/vueapp/src/components/FilterApp.vue b/variants/vueapp/src/components/FilterApp.vue
index 07b23ae85..88e3ba3a2 100644
--- a/variants/vueapp/src/components/FilterApp.vue
+++ b/variants/vueapp/src/components/FilterApp.vue
@@ -7,6 +7,7 @@ import { useVariantFlagsStore } from '@variants/stores/variantFlags'
 import { useVariantCommentsStore } from '@variants/stores/variantComments'
 import { useVariantQueryStore } from '@variants/stores/variantQuery'
 import { useVariantAcmgRatingStore } from '@variants/stores/variantAcmgRating'
+import { useVariantResultSetStore } from '@variants/stores/variantResultSet'
 import { useCaseDetailsStore } from '@cases/stores/caseDetails'
 import { updateUserSetting } from '@varfish/userSettings'
 import {
@@ -25,22 +26,6 @@ import FilterResultsTable from '@variants/components/FilterResultsTable.vue'
 const props = defineProps({
   /** The case UUID. */
   caseUuid: String,
-  /** The page. */
-  page: Number,
-  /** The page size. */
-  pageSize: Number,
-  /** The column to order by. */
-  orderBy: String,
-  /** The direction of ordering. */
-  orderDir: String,
-  /** Display coordinates or clinvar. */
-  displayDetails: Number,
-  /** The frequency column to display. */
-  displayFrequency: Number,
-  /** The constraint column to display. */
-  displayConstraint: Number,
-  /** The optional columns to display. */
-  displayColumns: Array,
 })
 
 const appContext = JSON.parse(
@@ -55,6 +40,7 @@ const variantFlagsStore = useVariantFlagsStore()
 const variantCommentsStore = useVariantCommentsStore()
 const variantAcmgRatingStore = useVariantAcmgRatingStore()
 const caseDetailsStore = useCaseDetailsStore()
+const variantResultSetStore = useVariantResultSetStore()
 
 const showDetails = async (event) => {
   router.push({
@@ -72,27 +58,27 @@ const formVisible = ref(true)
 const queryLogsVisible = ref(false)
 /** The details columns to show. */
 const displayDetails = ref(
-  props.displayDetails === null
+  variantResultSetStore.displayDetails === null
     ? DisplayDetails.Coordinates.value
-    : props.displayDetails,
+    : variantResultSetStore.displayDetails,
 )
 /** The frequency columns to show. */
 const displayFrequency = ref(
-  props.displayFrequency === null
+  variantResultSetStore.displayFrequency === null
     ? DisplayFrequencies.GnomadExomes.value
-    : props.displayFrequency,
+    : variantResultSetStore.displayFrequency,
 )
 /** The constraint columns to show. */
 const displayConstraint = ref(
-  props.displayConstraint === null
+  variantResultSetStore.displayConstraint === null
     ? DisplayConstraints.GnomadPli.value
-    : props.displayConstraint,
+    : variantResultSetStore.displayConstraint,
 )
 /** The additional columns to display. */
 const displayColumns = ref(
-  props.displayColumns === null
+  variantResultSetStore.displayColumns === null
     ? [DisplayColumns.Effect.value]
-    : props.displayColumns.split(','),
+    : variantResultSetStore.displayColumns.split(','),
 )
 
 // Toggle visibility of the form.
@@ -197,6 +183,13 @@ const refreshStores = async () => {
               displayColumns.value.push(`extra_anno${value.field}`)
             })
         }
+        variantResultSetStore
+          .initialize(appContext.csrf_token)
+          .then(async () => {
+            await variantResultSetStore.loadResultSetViaQuery(
+              variantQueryStore.queryUuid,
+            )
+          })
       }),
   ])
 }
@@ -260,12 +253,6 @@ watch(
       class="flex-grow-1 mb-2"
     >
       <FilterResultsTable
-        :case="caseDetailsStore.caseObj"
-        :extra-anno-fields="variantQueryStore.extraAnnoFields"
-        v-model:display-details="displayDetails"
-        v-model:display-frequency="displayFrequency"
-        v-model:display-constraint="displayConstraint"
-        v-model:display-columns="displayColumns"
         @variant-selected="showDetails"
         :patho-enabled="
           variantQueryStore.previousQueryDetails.query_settings.patho_enabled
@@ -273,10 +260,6 @@ watch(
         :prio-enabled="
           variantQueryStore.previousQueryDetails.query_settings.prio_enabled
         "
-        :page="props.page"
-        :pageSize="props.pageSize"
-        :orderBy="props.orderBy"
-        :orderDir="props.orderDir"
       />
     </div>
     <div
diff --git a/variants/vueapp/src/components/FilterApp/Header.vue b/variants/vueapp/src/components/FilterApp/Header.vue
index ca62acbde..adff72854 100644
--- a/variants/vueapp/src/components/FilterApp/Header.vue
+++ b/variants/vueapp/src/components/FilterApp/Header.vue
@@ -82,7 +82,7 @@ watch(
         class="btn btn-secondary"
         @click.prevent="
           router.push({
-            name: 'case-detail',
+            name: 'case-detail-overview',
             params: { case: caseDetailsStore.caseObj.sodar_uuid },
           })
         "
diff --git a/variants/vueapp/src/components/FilterResultsTable.vue b/variants/vueapp/src/components/FilterResultsTable.vue
index 56728f688..2c3cf18da 100644
--- a/variants/vueapp/src/components/FilterResultsTable.vue
+++ b/variants/vueapp/src/components/FilterResultsTable.vue
@@ -14,11 +14,11 @@ import { getAcmgBadge } from '@variants/helpers'
 import { VariantClient } from '@variants/api/variantClient'
 import ColumnControl from '@variants/components/ColumnControl.vue'
 import ExportResults from '@variants/components/ExportResults.vue'
-import { useVariantDetailsStore } from '@variants/stores/variantDetails'
+import { useCaseDetailsStore } from '@cases/stores/caseDetails'
 import { useVariantFlagsStore } from '@variants/stores/variantFlags'
 import { useVariantCommentsStore } from '@variants/stores/variantComments'
-import { useVariantQueryStore } from '@variants/stores/variantQuery'
 import { useVariantAcmgRatingStore } from '@variants/stores/variantAcmgRating'
+import { useVariantResultSetStore } from '@variants/stores/variantResultSet'
 import { copy, declareWrapper } from '@variants/helpers'
 import {
   DisplayConstraints,
@@ -26,36 +26,17 @@ import {
   DisplayFrequencies,
   DisplayColumnsToText,
   DisplayDetails,
+  DisplayColumns,
 } from '@variants/enums'
 
 /**
  * The component's props.
  */
 const props = defineProps({
-  /** The case with the property to display for. */
-  case: Object,
-  /** Which details to display, integer value from {@code DisplayDetails}. */
-  displayDetails: Number,
-  /** Which frequency information to display, integer value from {@code DisplayFrequency}. */
-  displayFrequency: Number,
-  /** The constraint to display, integer value from {@code DisplayConstraint}. */
-  displayConstraint: Number,
-  /** The additional columns to display; Integers from {@code DisplayColumns}. */
-  displayColumns: Array,
-  /** The extra fields information. */
-  extraAnnoFields: Array,
   /** The pathogenicity score enabled. */
   pathoEnabled: Boolean,
   /** The phenotype score enabled. */
   prioEnabled: Boolean,
-  /** The page. */
-  page: Number,
-  /** The page size. */
-  pageSize: Number,
-  /** The column to order by. */
-  orderBy: String,
-  /** The direction of ordering. */
-  orderDir: String,
 })
 
 /**
@@ -64,106 +45,96 @@ const props = defineProps({
 const emit = defineEmits([
   /** Variant has been selected. */
   'variantSelected',
-  /** Emitted to notify about change in {@code displayDetails} prop. */
-  'update:displayDetails',
-  /** Emitted to notify about change in {@code displayFrequency} prop. */
-  'update:displayFrequency',
-  /** Emitted to notify about change in {@code displayConstraint} prop. */
-  'update:displayConstraint',
-  /** Emitted to notify about change in {@code displayColumns} prop. */
-  'update:displayColumns',
 ])
 
-/** Wrapper around {@code displayDetails} prop. */
-const displayDetailsWrapper = declareWrapper(props, 'displayDetails', emit)
-/** Wrapper around {@code displayFrequency} prop. */
-const displayFrequencyWrapper = declareWrapper(props, 'displayFrequency', emit)
-/** Wrapper around {@code displayConstraint} prop. */
-const displayConstraintWrapper = declareWrapper(
-  props,
-  'displayConstraint',
-  emit,
-)
-
-const router = useRouter()
-
-/** Wrapper around {@code displayColumns} prop. */
-const displayColumnsWrapper = declareWrapper(props, 'displayColumns', emit)
-/** The table server options, updated by Vue3EasyDataTable. */
-const tableServerOptions = ref({
-  page: props.page || 1,
-  rowsPerPage: props.pageSize || 50,
-  sortBy: props.orderBy || 'position',
-  sortType: props.orderDir || 'asc',
-})
-
 /**
  * Setup stores before mounting the component.
  */
-const variantDetailsStore = useVariantDetailsStore()
-const queryStore = useVariantQueryStore()
+const caseDetailsStore = useCaseDetailsStore()
 const flagsStore = useVariantFlagsStore()
 const commentsStore = useVariantCommentsStore()
 const acmgRatingStore = useVariantAcmgRatingStore()
+const variantResultSetStore = useVariantResultSetStore()
 
-/** Update display when pagination or sorting changed. */
-/**
-watch(
-  [
-    () => queryStore.tableServerOptions.page,
-    () => queryStore.tableServerOptions.rowsPerPage,
-    () => queryStore.tableServerOptions.sortBy,
-    () => queryStore.tableServerOptions.sortType,
-  ],
-  async (
-    [_newPageNo, _newRowsPerPage, _newSortBy, _newSortType],
-    [_oldPageNo, _oldRowsPerPage, _oldSortBy, _oldSortType]
-  ) => {
-    queryStore.queryState = QueryStates.Resuming.value
-    await queryStore.runFetchLoop(queryStore.previousQueryDetails.sodar_uuid)
-  }
-)
-*/
+const router = useRouter()
+
+/** The details columns to show. */
+const displayDetails = computed({
+  get() {
+    return (
+      variantResultSetStore.displayDetails || DisplayDetails.Coordinates.value
+    )
+  },
+  set(newValue) {
+    variantResultSetStore.displayDetails = newValue
+  },
+})
+
+/** The frequency columns to show. */
+const displayFrequency = computed({
+  get() {
+    return (
+      variantResultSetStore.displayFrequency ||
+      DisplayFrequencies.GnomadExomes.value
+    )
+  },
+  set(newValue) {
+    variantResultSetStore.displayFrequency = newValue
+  },
+})
+
+/** The constraint columns to show. */
+const displayConstraint = computed({
+  get() {
+    return (
+      variantResultSetStore.displayConstraint ||
+      DisplayConstraints.GnomadPli.value
+    )
+  },
+  set(newValue) {
+    variantResultSetStore.displayConstraint = newValue
+  },
+})
+
+/** The additional columns to display. */
+const displayColumns = computed({
+  get() {
+    return variantResultSetStore.displayColumns || [DisplayColumns.Effect.value]
+  },
+  set(newValue) {
+    variantResultSetStore.displayColumns = newValue
+  },
+})
+
+/** The table server options, updated by Vue3EasyDataTable. */
+const tableServerOptions = computed({
+  get() {
+    return {
+      page: variantResultSetStore.pageNo || 1,
+      rowsPerPage: variantResultSetStore.pageSize || 50,
+      sortBy: variantResultSetStore.sortBy || 'position',
+      sortType: variantResultSetStore.sortType || 'asc',
+    }
+  },
+  set(options) {
+    variantResultSetStore.pageNo = options.page
+    variantResultSetStore.pageSize = options.rowsPerPage
+    variantResultSetStore.sortBy = options.sortBy
+    variantResultSetStore.sortType = options.sortType
+  },
+})
 
 const appContext = JSON.parse(
   document.getElementById('sodar-ss-app-context').getAttribute('app-context') ||
     '{}',
 )
 
-onBeforeMount(() => {
-  tableLoading.value = true
-  Promise.all([
-    flagsStore.initialize(
-      appContext.csrf_token,
-      appContext.project?.sodar_uuid,
-      queryStore.caseUuid,
-    ),
-    commentsStore.initialize(
-      appContext.csrf_token,
-      appContext.project?.sodar_uuid,
-      queryStore.caseUuid,
-    ),
-    acmgRatingStore.initialize(
-      appContext.csrf_token,
-      appContext.project?.sodar_uuid,
-      queryStore.caseUuid,
-    ),
-  ]).then(() => {
-    tableLoading.value = false
-  })
-})
-
-// const displayConstraintText = computed(() => {
-//   /** TODO Somehow it displays the string with quotes ... :/ */
-//   return DisplayConstraintsToText[displayConstraintWrapper.value]
-// })
-
 /**
  * Setup for easy-data-table.
  */
 
 const coordinatesClinvarColumns = () => {
-  if (props.displayDetails === DisplayDetails.Clinvar.value) {
+  if (displayDetails.value === DisplayDetails.Clinvar.value) {
     return [{ text: 'clinvar summary', value: 'clinvar' }]
   }
   return [
@@ -175,10 +146,13 @@ const coordinatesClinvarColumns = () => {
 
 const optionalColumns = () => {
   const optionalColumnTexts = copy(DisplayColumnsToText)
-  for (const { field, label } of props.extraAnnoFields) {
+  if (!extraAnnoFields.value) {
+    return []
+  }
+  for (const { field, label } of extraAnnoFields.value) {
     optionalColumnTexts[`extra_anno${field}`] = label
   }
-  return props.displayColumns.map((field) => ({
+  return displayColumns.value.map((field) => ({
     text: optionalColumnTexts[field],
     value: field,
     sortable: field.startsWith('extra_anno'),
@@ -187,10 +161,10 @@ const optionalColumns = () => {
 
 const genotypeMapping = {}
 const genotypeColumns = () => {
-  if (!props.case) {
+  if (!caseDetailsStore.caseObj) {
     return []
   }
-  return props.case.pedigree.map(({ name }) => {
+  return caseDetailsStore.caseObj.pedigree.map(({ name }) => {
     genotypeMapping[`genotype_${displayName(name)}`] = name
     return {
       text: displayName(name),
@@ -308,36 +282,36 @@ const getAcmgBadgeClasses = (acmgClass) => {
 }
 
 const freqHomFieldName = computed(() => {
-  return displayFrequencyWrapper.value === DisplayFrequencies.Exac.value
+  return displayFrequency.value === DisplayFrequencies.Exac.value
     ? { frequency: 'exac_frequency', homozygous: 'exac_homozygous' }
-    : displayFrequencyWrapper.value === DisplayFrequencies.ThousandGenomes.value
+    : displayFrequency.value === DisplayFrequencies.ThousandGenomes.value
     ? {
         frequency: 'thousand_genomes_frequency',
         homozygous: 'thousand_genomes_homozygous',
       }
-    : displayFrequencyWrapper.value === DisplayFrequencies.GnomadExomes.value
+    : displayFrequency.value === DisplayFrequencies.GnomadExomes.value
     ? {
         frequency: 'gnomad_exomes_frequency',
         homozygous: 'gnomad_exomes_homozygous',
       }
-    : displayFrequencyWrapper.value === DisplayFrequencies.GnomadGenomes.value
+    : displayFrequency.value === DisplayFrequencies.GnomadGenomes.value
     ? {
         frequency: 'gnomad_genomes_frequency',
         homozygous: 'gnomad_genomes_homozygous',
       }
-    : displayFrequencyWrapper.value === DisplayFrequencies.InhouseDb.value
+    : displayFrequency.value === DisplayFrequencies.InhouseDb.value
     ? { frequency: 'inhouse_carriers', homozygous: 'inhouse_hom_alt' }
-    : displayFrequencyWrapper.value === DisplayFrequencies.MtDb.value
+    : displayFrequency.value === DisplayFrequencies.MtDb.value
     ? { frequency: 'mtdb_frequency', homozygous: 'mtdb_count' }
-    : displayFrequencyWrapper.value === DisplayFrequencies.HelixMtDb.value
+    : displayFrequency.value === DisplayFrequencies.HelixMtDb.value
     ? { frequency: 'helixmtdb_frequency', homozygous: 'helixmtdb_hom_count' }
-    : displayFrequencyWrapper.value === DisplayFrequencies.Mitomap.value
+    : displayFrequency.value === DisplayFrequencies.Mitomap.value
     ? { frequency: 'mitomap_frequency', homozygous: 'mitomap_count' }
     : { frequency: null, homozygous: null }
 })
 
 const displayFrequencyContent = (item) => {
-  return displayFrequencyWrapper.value === DisplayFrequencies.InhouseDb.value
+  return displayFrequency.value === DisplayFrequencies.InhouseDb.value
     ? item[freqHomFieldName.value.frequency]
     : formatFreq(item[freqHomFieldName.value.frequency])
 }
@@ -347,19 +321,19 @@ const displayHomozygousContent = (item) => {
 }
 
 const constraintFieldName = computed(() => {
-  return displayConstraintWrapper.value === DisplayConstraints.ExacPli.value
+  return displayConstraint.value === DisplayConstraints.ExacPli.value
     ? 'exac_pLI'
-    : displayConstraintWrapper.value === DisplayConstraints.ExacZMis.value
+    : displayConstraint.value === DisplayConstraints.ExacZMis.value
     ? 'exac_mis_z'
-    : displayConstraintWrapper.value === DisplayConstraints.ExacZSyn.value
+    : displayConstraint.value === DisplayConstraints.ExacZSyn.value
     ? 'exac_syn_z'
-    : displayConstraintWrapper.value === DisplayConstraints.GnomadLoeuf.value
+    : displayConstraint.value === DisplayConstraints.GnomadLoeuf.value
     ? 'gnomad_loeuf'
-    : displayConstraintWrapper.value === DisplayConstraints.GnomadPli.value
+    : displayConstraint.value === DisplayConstraints.GnomadPli.value
     ? 'gnomad_pLI'
-    : displayConstraintWrapper.value === DisplayConstraints.GnomadZMis.value
+    : displayConstraint.value === DisplayConstraints.GnomadZMis.value
     ? 'gnomad_mis_z'
-    : displayConstraintWrapper.value === DisplayConstraints.GnomadZSyn.value
+    : displayConstraint.value === DisplayConstraints.GnomadZSyn.value
     ? 'gnomad_syn_z'
     : null
 })
@@ -417,13 +391,6 @@ const showVariantDetails = (sodarUuid, section) => {
   })
 }
 
-const showAcmgRating = (sodarUuid) => {
-  emit('variantSelected', {
-    smallvariantresultrow: sodarUuid,
-    selectedSection: 'acmg-rating',
-  })
-}
-
 const displayAmbiguousFrequencyWarning = (item) => {
   const tables = [
     'exac',
@@ -464,98 +431,58 @@ const loadFromServer = async () => {
     return row
   }
 
-  const variantClient = new VariantClient(queryStore.csrfToken)
+  const variantClient = new VariantClient(variantResultSetStore.csrfToken)
 
   tableLoading.value = true
-  const response = await variantClient.listQueryResultRow(
-    queryStore.queryResultSet.sodar_uuid,
-    {
-      pageNo: tableServerOptions.value.page,
-      pageSize: tableServerOptions.value.rowsPerPage,
-      orderBy:
-        tableServerOptions.value.sortBy === 'position'
-          ? 'chromosome_no,start'
-          : tableServerOptions.value.sortBy === 'gene'
-          ? 'symbol'
-          : tableServerOptions.value.sortBy === 'gene_icons'
-          ? 'acmg_symbol,disease_gene'
-          : tableServerOptions.value.sortBy === 'frequency'
-          ? freqHomFieldName.value.frequency
-          : tableServerOptions.value.sortBy === 'homozygous'
-          ? freqHomFieldName.value.homozygous
-          : tableServerOptions.value.sortBy === 'constraints'
-          ? constraintFieldName.value
-          : tableServerOptions.value.sortBy?.startsWith('genotype_')
-          ? 'genotype_' + genotypeMapping[tableServerOptions.value.sortBy]
-          : tableServerOptions.value.sortBy,
-      orderDir: tableServerOptions.value.sortType,
-    },
-  )
-  tableRows.value = response.results.map((row) => transmogrify(row))
-  tableLoading.value = false
-}
-
-const pushRoute = () => {
-  router.push({
-    name: 'variants-filter',
-    params: {
-      case: props.case.sodar_uuid,
-      query: queryStore.queryResultSet.sodar_uuid,
-      orderBy: tableServerOptions.value.sortBy,
-      orderDir: tableServerOptions.value.sortType,
-      page: tableServerOptions.value.page,
-      pageSize: tableServerOptions.value.rowsPerPage,
-      displayDetails: displayDetailsWrapper.value,
-      displayFrequency: displayFrequencyWrapper.value,
-      displayConstraint: displayConstraintWrapper.value,
-      displayColumns: displayColumnsWrapper.value.join(','),
-    },
-  })
+  if (variantResultSetStore.resultSetUuid) {
+    const response = await variantClient.listQueryResultRow(
+      variantResultSetStore.resultSetUuid,
+      {
+        pageNo: tableServerOptions.value.page,
+        pageSize: tableServerOptions.value.rowsPerPage,
+        orderBy:
+          tableServerOptions.value.sortBy === 'position'
+            ? 'chromosome_no,start'
+            : tableServerOptions.value.sortBy === 'gene'
+            ? 'symbol'
+            : tableServerOptions.value.sortBy === 'gene_icons'
+            ? 'acmg_symbol,disease_gene'
+            : tableServerOptions.value.sortBy === 'frequency'
+            ? freqHomFieldName.value.frequency
+            : tableServerOptions.value.sortBy === 'homozygous'
+            ? freqHomFieldName.value.homozygous
+            : tableServerOptions.value.sortBy === 'constraints'
+            ? constraintFieldName.value
+            : tableServerOptions.value.sortBy?.startsWith('genotype_')
+            ? 'genotype_' + genotypeMapping[tableServerOptions.value.sortBy]
+            : tableServerOptions.value.sortBy,
+        orderDir: tableServerOptions.value.sortType,
+      },
+    )
+    tableRows.value = response.results.map((row) => transmogrify(row))
+    tableLoading.value = false
+  }
 }
 
+const extraAnnoFields = ref()
+
 /** Load data when mounted. */
-onMounted(() => {
-  loadFromServer()
+onBeforeMount(async () => {
+  const variantClient = new VariantClient(caseDetailsStore.csrfToken)
+  extraAnnoFields.value = await variantClient.fetchExtraAnnoFields(
+    caseDetailsStore.csrfToken,
+  )
+  if (variantResultSetStore.resultSetUuid) {
+    await loadFromServer()
+  }
 })
 
-/** Watch changes in tableServerOptions and reload if necessary. */
 watch(
-  tableServerOptions,
+  () => variantResultSetStore.resultSetUuid,
   (_newValue, _oldValue) => {
-    pushRoute()
-    loadFromServer()
-  },
-  { deep: true },
-)
-
-watch(
-  displayDetailsWrapper,
-  (_newValue, _oldValue) => {
-    pushRoute()
-  },
-  { deep: true },
-)
-
-watch(
-  displayFrequencyWrapper,
-  (_newValue, _oldValue) => {
-    pushRoute()
-  },
-  { deep: true },
-)
-
-watch(
-  displayConstraintWrapper,
-  (_newValue, _oldValue) => {
-    pushRoute()
-  },
-  { deep: true },
-)
-
-watch(
-  displayColumnsWrapper,
-  (_newValue, _oldValue) => {
-    pushRoute()
+    if (_newValue) {
+      loadFromServer()
+    }
   },
   { deep: true },
 )
@@ -572,16 +499,16 @@ watch(
         </div>
         <div class="text-center">
           <span class="btn btn-sm btn-outline-secondary" id="results-button">
-            {{ queryStore.queryResultSet.result_row_count }}
+            {{ variantResultSetStore?.resultSet?.result_row_count }}
           </span>
         </div>
       </div>
       <ColumnControl
-        :extra-anno-fields="props.extraAnnoFields"
-        v-model:display-details="displayDetailsWrapper"
-        v-model:display-frequency="displayFrequencyWrapper"
-        v-model:display-constraint="displayConstraintWrapper"
-        v-model:display-columns="displayColumnsWrapper"
+        :extra-anno-fields="extraAnnoFields"
+        v-model:display-details="displayDetails"
+        v-model:display-frequency="displayFrequency"
+        v-model:display-constraint="displayConstraint"
+        v-model:display-columns="displayColumns"
       />
       <ExportResults />
     </div>
@@ -591,7 +518,9 @@ watch(
         table-class-name="customize-table"
         :loading="tableLoading"
         :body-row-class-name="tableRowClassName"
-        :server-items-length="queryStore.queryResultSet.result_row_count"
+        :server-items-length="
+          variantResultSetStore?.resultSet?.result_row_count
+        "
         :headers="tableHeaders"
         :items="tableRows"
         :rows-items="[20, 50, 200, 1000]"
@@ -836,7 +765,7 @@ watch(
           {{ extraAnnoFieldFormat(payload.extra_annos, field) }}
         </template>
         <template
-          v-for="{ name } in props.case?.pedigree"
+          v-for="{ name } in caseDetailsStore.caseObj?.pedigree"
           v-slot:[`item-genotype_${displayName(name)}`]="{ payload }"
         >
           {{ payload.genotype[name].gt }}
@@ -850,27 +779,27 @@ watch(
         <template #item-patho_pheno_score="{ payload }">
           {{ formatFloat(payload.patho_pheno_score, 3) }}
         </template>
-        <template #item-igv="{ payload }">
+        <template #item-igv="item">
           <div class="btn-group btn-group-sm">
             <div
               class="btn btn-sm btn-outline-secondary"
               style="font-size: 80%"
-              @click="flagsStore.flagAsArtifact(payload)"
+              @click="flagsStore.flagAsArtifact(item)"
               role="button"
             >
               <i-fa-solid-thumbs-down class="text-muted" />
             </div>
             <a
-              :href="mtLink(payload)"
+              :href="mtLink(item)"
               target="_blank"
               style="font-size: 80%"
               class="btn btn-sm btn-outline-secondary"
-              :class="mtLink(payload) === '#' ? 'disabled' : ''"
+              :class="mtLink(item) === '#' ? 'disabled' : ''"
             >
               MT
             </a>
             <button
-              @click="goToLocus(payload)"
+              @click="goToLocus(item)"
               type="button"
               title="Go to locus in IGV"
               style="font-size: 80%"
diff --git a/variants/vueapp/src/enums.ts b/variants/vueapp/src/enums.ts
index f98d57ea0..8225912b7 100644
--- a/variants/vueapp/src/enums.ts
+++ b/variants/vueapp/src/enums.ts
@@ -51,6 +51,33 @@ export const QueryStates = Object.freeze({
 
 export const QueryStateToText = enumToText(QueryStates)
 
+export const ResultStates = Object.freeze({
+  None: {
+    value: 'none',
+    text: 'None',
+  },
+  Initial: {
+    value: 'initial',
+    text: 'Initial',
+  },
+  Fetching: {
+    value: 'loading-results',
+    text: 'Loading results',
+  },
+  Fetched: {
+    value: 'results-loaded',
+    text: 'Results loaded',
+  },
+  Timeout: {
+    value: 'timeout',
+    text: 'Timeout',
+  },
+  Error: {
+    value: 'error',
+    text: 'Error',
+  },
+})
+
 export const apiQueryStateToQueryState = (apiQueryState) => {
   if (apiQueryState === 'initial') {
     return QueryStates.Initial.value
diff --git a/variants/vueapp/src/stores/variantQuery.js b/variants/vueapp/src/stores/variantQuery.js
index 414c5eac8..ac37ca33c 100644
--- a/variants/vueapp/src/stores/variantQuery.js
+++ b/variants/vueapp/src/stores/variantQuery.js
@@ -5,6 +5,7 @@ import { VariantClient } from '@variants/api/variantClient'
 import { apiQueryStateToQueryState, QueryStates } from '@variants/enums'
 import { copy } from '@variants/helpers'
 import { previousQueryDetailsToQuerySettings } from '@variants/stores/variantQuery.funcs'
+import { useVariantResultSetStore } from '@variants/stores/variantResultSet'
 import { defineStore } from 'pinia'
 import { nextTick, reactive, ref } from 'vue'
 
@@ -179,6 +180,8 @@ export const useVariantQueryStore = defineStore('variantQuery', () => {
 
   /** The caseDetails store */
   const caseDetailsStore = useCaseDetailsStore()
+  /** The variantResultSet store */
+  const variantResultSetStore = useVariantResultSetStore()
 
   // data passed to `initialize` and store state
 
@@ -220,8 +223,6 @@ export const useVariantQueryStore = defineStore('variantQuery', () => {
   const querySettings = ref(null)
   /** Details from previous query. */
   const previousQueryDetails = ref(null)
-  /** Results of query. */
-  const queryResultSet = ref(null)
   /** Uuid of query. */
   const queryUuid = ref(null)
   /** Download status TSV. */
@@ -304,24 +305,11 @@ export const useVariantQueryStore = defineStore('variantQuery', () => {
       }
     }
 
-    // Once query is finished, load results, if still for the same query.
     if (queryState.value === QueryStates.Finished.value) {
       queryState.value = QueryStates.Fetching.value
       await nextTick()
-      // List the results
-      const responseResultSetList = await variantClient.listQueryResultSet(
-        queryUuid,
-      )
-      if (!responseResultSetList.length) {
-        console.error('ERROR: no results in response')
-      } else if (
-        queryState.value === QueryStates.Fetching.value &&
-        previousQueryDetails.value.sodar_uuid === queryUuid
-      ) {
-        // Still fetching the same query; push to query result set.
-        queryResultSet.value = responseResultSetList[0]
-        queryState.value = QueryStates.Fetched.value
-      }
+      await variantResultSetStore.loadResultSetViaQuery(queryUuid)
+      queryState.value = QueryStates.Fetched.value
       return // break out of loop
     }
 
@@ -621,7 +609,6 @@ export const useVariantQueryStore = defineStore('variantQuery', () => {
     querySettingsPresets.value = null
     querySettings.value = null
     previousQueryDetails.value = null
-    queryResultSet.value = null
     queryUuid.value = null
     downloadStatusTsv.value = null
     downloadStatusVcf.value = null
@@ -663,7 +650,7 @@ export const useVariantQueryStore = defineStore('variantQuery', () => {
     querySettingsPresets,
     querySettings,
     previousQueryDetails,
-    queryResultSet,
+    queryUuid,
     queryState,
     queryStateMsg,
     queryLogs,
diff --git a/variants/vueapp/src/stores/variantResultSet.ts b/variants/vueapp/src/stores/variantResultSet.ts
index 45d80965f..9f41037c7 100644
--- a/variants/vueapp/src/stores/variantResultSet.ts
+++ b/variants/vueapp/src/stores/variantResultSet.ts
@@ -31,6 +31,23 @@ export const useVariantResultSetStore = defineStore('variantResultSet', () => {
   /** Query of result set, if any. */
   const query = ref<any | null>(null)
 
+  /** Table server option page number. */
+  const tablePageNo = ref<number | null>(null)
+  /** Table server option page size. */
+  const tablePageSize = ref<number | null>(null)
+  /** Table server option to sort column by. */
+  const tableSortBy = ref<any | null>(null)
+  /** Table server option sort asc or desc. */
+  const tableSortType = ref<string | null>(null)
+  /** Which details to display, integer value from {@code DisplayDetails}. */
+  const displayDetails = ref<number | null>(null)
+  /** Which frequency information to display, integer value from {@code DisplayFrequency}. */
+  const displayFrequency = ref<number | null>(null)
+  /** The constraint to display, integer value from {@code DisplayConstraint}. */
+  const displayConstraint = ref<number | null>(null)
+  /** The additional columns to display; Integers from {@code DisplayColumns}. */
+  const displayColumns = ref<any | null>(null)
+
   /** Promise for initialization of the store. */
   const initializeRes = ref<Promise<any> | null>(null)
 
@@ -67,6 +84,33 @@ export const useVariantResultSetStore = defineStore('variantResultSet', () => {
     return initializeRes.value
   }
 
+  const loadResultSetViaQuery = async (queryUuid$: string) => {
+    // Once query is finished, load results, if still for the same query.
+    const variantClient = new VariantClient(csrfToken.value)
+    const responseResultSetList = await variantClient.listQueryResultSet(
+      queryUuid$,
+    )
+    if (!responseResultSetList.length) {
+      console.error('ERROR: no results in response')
+    } else {
+      // Still fetching the same query; push to query result set.
+      resultSet.value = responseResultSetList[0]
+      resultSetUuid.value = responseResultSetList[0].sodar_uuid
+    }
+  }
+
+  const loadResultSetViaCase = async (caseUuid$: any) => {
+    // Once query is finished, load results, if still for the same query.
+    const variantClient = new VariantClient(csrfToken.value)
+    const case$ = await variantClient.retrieveCase(caseUuid$)
+    if (case$.smallvariantqueryresultset) {
+      resultSet.value = case$.smallvariantqueryresultset
+      resultSetUuid.value = case$.smallvariantqueryresultset.sodar_uuid
+    } else {
+      console.error('ERROR: no result set in case response')
+    }
+  }
+
   /**
    * Fetch the result set via the given result row UUID.
    */
@@ -129,8 +173,18 @@ export const useVariantResultSetStore = defineStore('variantResultSet', () => {
     query,
     caseUuid,
     initializeRes,
+    tablePageNo,
+    tablePageSize,
+    tableSortBy,
+    tableSortType,
+    displayDetails,
+    displayFrequency,
+    displayConstraint,
+    displayColumns,
     // functions
     initialize,
     fetchResultSetViaRow,
+    loadResultSetViaQuery,
+    loadResultSetViaCase,
   }
 })