diff --git a/biogenome-client/configs/charts.json b/biogenome-client/configs/charts.json
index 2af4d4a8..9db224e7 100644
--- a/biogenome-client/configs/charts.json
+++ b/biogenome-client/configs/charts.json
@@ -7,8 +7,8 @@
             "type": "pie"
         },
         {
-            "model": "assemblies",
-            "field": "metadata.assembly_info.assembly_level",
+            "model": "organisms",
+            "field": "goat_status",
             "class": "flex lg6 md6 sm12 xs12",
             "type": "pie"
         }
@@ -73,5 +73,24 @@
             "type": "dateline"
         }
     ],
-    "organisms": []
+    "organisms": [
+        {
+            "model": "organisms",
+            "field": "insdc_status",
+            "class": "flex lg6 md6 sm12 xs12",
+            "type": "pie"
+        },
+        {
+            "model": "organisms",
+            "field": "goat_status",
+            "class": "flex lg6 md6 sm12 xs12",
+            "type": "pie"
+        },
+        {
+            "model": "organisms",
+            "field": "target_list_status",
+            "class": "flex lg6 md6 sm12 xs12",
+            "type": "pie"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/biogenome-client/configs/columns.json b/biogenome-client/configs/columns.json
index 7f8f6e41..64d6fd3e 100644
--- a/biogenome-client/configs/columns.json
+++ b/biogenome-client/configs/columns.json
@@ -7,6 +7,11 @@
         "metadata.lifestage",
         "metadata.tissue"
     ],
+    "local_samples": [
+        "local_id",
+        "scientific_name",
+        "taxid"
+    ],
     "experiments": [
         "experiment_accession",
         "metadata.scientific_name",
@@ -24,11 +29,5 @@
         "metadata.assembly_info.assembly_type",
         "metadata.assembly_info.assembly_status",
         "metadata.assembly_info.release_date"
-    ],
-    "organisms": [
-        "scientific_name",
-        "taxid",
-        "insdc_common_name",
-        "insdc_status"
     ]
 }
\ No newline at end of file
diff --git a/biogenome-client/configs/filters.json b/biogenome-client/configs/filters.json
index c53e94c1..a3c23bf5 100644
--- a/biogenome-client/configs/filters.json
+++ b/biogenome-client/configs/filters.json
@@ -53,6 +53,14 @@
         {
             "key": "insdc_status",
             "type": "select"
+        },
+        {
+            "key": "goat_status",
+            "type": "select"
+        },
+        {
+            "key": "target_list_status",
+            "type": "select"
         }
     ]
 }
\ No newline at end of file
diff --git a/biogenome-client/configs/general.json b/biogenome-client/configs/general.json
index b940d498..39f5b0fe 100644
--- a/biogenome-client/configs/general.json
+++ b/biogenome-client/configs/general.json
@@ -1,38 +1,27 @@
 {
-    "title": "EBP Portal Community Edition",
+    "title": "Catalan Initiative for the Earth BioGenome Project",
     "nav": {
-        "logo": "EBP-Logo.png",
-        "url": "https://www.earthbiogenome.org/"
+      "logo": "CBPLogo.png",
+      "url": "https://www.biogenoma.cat"
     },
-    "cms": false,
-    "goat": false,
-    "tracker": "",
+    "cms": true,
+    "goat": true,
+    "tracker": "cbp-tracking.js",
     "languages": [
-        {
-            "code": "gb",
-            "name": "english"
-        },
-        {
-            "code": "es-ct",
-            "name": "catalan"
-        },
-        {
-            "code": "fr",
-            "name": "french"
-        },
-        {
-            "code": "es",
-            "name": "spanish"
-        }
+      {
+        "code": "gb",
+        "name": "english"
+      },
+      {
+        "code": "es-ct",
+        "name": "catalan"
+      }
     ],
     "wiki": {
-        "gb": "https://en.m.wikipedia.org/wiki",
-        "es-ct": "https://ca.m.wikipedia.org/wiki",
-        "fr": "https://fr.m.wikipedia.org/wiki",
-        "es": "https://es.m.wikipedia.org/wiki"
+      "gb": "https://en.m.wikipedia.org/wiki",
+      "es-ct": "https://ca.m.wikipedia.org/wiki"
     },
     "maps": [
-        "samples-map",
-        "countries"
+        "samples-map"
     ]
 }
\ No newline at end of file
diff --git a/biogenome-client/configs/pages.json b/biogenome-client/configs/pages.json
index e7ec1879..1d432511 100644
--- a/biogenome-client/configs/pages.json
+++ b/biogenome-client/configs/pages.json
@@ -1,72 +1,62 @@
 {
     "dashboard": {
         "title": {
-            "gb": "EBP Portal Community Edition",
-            "es-ct": "EBP Portal Community Edition",
-            "es": "EBP Portal Community Edition",
-            "fr": "EBP Portal Community Edition"
+            "gb": "Catalan Initiative for the Earth BioGenome Project",
+            "es-ct": "Iniciativa Catalana per a l’Earth BioGenome Project"
         },
         "description": {
-            "gb": "This portal tracks the INSDC submission progress of the Earth Biogenome Project (EBP)",
-            "es-ct": "Aquest portal segueix el progrés de les submissions a l'INSDC del Projecte Biogenoma Terrestre (EBP).",
-            "es": "Este portal sigue el progreso de la submission en el INSDC del Proyecto de Biogenoma Terrestre (EBP)",
-            "fr": "Ce portail suit l'avancement des soumissions à l'INSDC du Projet de Biogénome Terrestre (EBP)."
+            "gb": "The Catalan Initiative for the Earth BioGenome Project (CBP) aims to produce a detailed catalogue of the genome of eukaryotic species in the Catalan territories",
+            "es-ct": "La Iniciativa Catalana per a l’Earth BioGenome Project (CBP) té per objectiu la producció d’un catàleg detallat del genoma de les espècies eucariotes dels territoris de parla catalana."
         }
     },
     "biosamples": {
         "title": {
-            "gb": "BioSamples collected under the EBP",
-            "es-ct": "BioSamples recopilades sota l'EBP.",
-            "fr": "BioSamples collectés dans le cadre de l'EBP",
-            "es": "BioSamples recolectadas bajo el EBP"
+            "gb": "BioSamples",
+            "es-ct": "BioSamples"
         },
         "description": {
-            "gb": "These biosamples, include those associated with projects ERGA, DTOL, or CBP, as well as those retrieved from assemblies and experiments metadata via a cronjob import.",
-            "es-ct": "Aquestes mostres biològiques inclouen aquelles associades als projectes ERGA, DTOL o CBP, així com aquelles recuperades del metadades de muntatge a través d'una importació de cronjob.",
-            "fr": "Ces échantillons biologiques incluent ceux associés aux projets ERGA, DTOL ou CBP, ainsi que ceux récupérés à partir des métadonnées d'assemblage via une importation cronjob.",
-            "es": "Estas muestras biológicas incluyen aquellas asociadas con los proyectos ERGA, DTOL o CBP, así como aquellas recuperadas de los metadatos de ensamblaje mediante una importación cronjob."
+            "gb": "These BioSamples include those associated with the CBP project, as well as those retrieved from assemblies and experiments metadata, all imported via a cronjob.",
+            "es-ct": "Aquestes BioSamples inclouen les associades amb el projecte CBP, així com les recuperades de les metadades d'assemblatges i experiments, totes importades mitjançant un cronjob."
+        }
+    },
+    "local_samples": {
+        "title": {
+            "gb": "Local samples",
+            "es-ct": "Mostres locals"
+        },
+        "description": {
+            "gb": "List of samples that have been imported into the database through spreadsheet uploads. These samples are currently awaiting submission to a broker or the European Nucleotide Archive (ENA)",
+            "es-ct": "Llista de mostres que s'han importat a la base de dades mitjançant càrregues de fulls de càlcul. Aquestes mostres estan actualment a l'espera de ser enviades a un intermediari o a l'Arxiu Nucleòtid Europeu (ENA)."
         }
     },
     "experiments": {
         "title": {
-            "gb": "Experiments collected under the EBP",
-            "es": "Experimentos recopilados bajo el EBP",
-            "es-ct": "Experimentos recopilats sota l'EBP",
-            "fr": "Expériments collectées dans le cadre de l'EBP"
+            "gb": "Experiments",
+            "es-ct": "Experimentos"
         },
         "description": {
-            "gb": "Experiments and Reads collected under the EBP",
-            "es": "Experimentos y lecturas recopilados bajo el EBP",
-            "es-ct": "Experimentos i lectures recopilats sota l'EBP",
-            "fr": "Expériments et lectures collectées dans le cadre de l'EBP"
+            "gb": "Experiments and Reads imported from INSDC under the CBP",
+            "es-ct": "Experiments i lectures importades de l'INSDC sota l'accés al projecte CBP"
         }
     },
     "assemblies": {
         "title": {
-            "gb": "Assemblies collected under the EBP",
-            "es": "Ensambles recopilados bajo el EBP",
-            "es-ct": "Muntatges recopilats sota l'EBP",
-            "fr": "Assemblages collectés dans le cadre de l'EBP"
+            "gb": "Assemblies",
+            "es-ct": "Assemblatges"
         },
         "description": {
-            "gb": "Assemblies retrieved from NCBI under EBP (PRJNA533106)",
-            "es": "Ensambles recuperados de NCBI bajo el EBP (PRJNA533106)",
-            "es-ct": "Muntatges recuperats de NCBI sota el EBP (PRJNA533106)",
-            "fr": "Assemblages récupérés de NCBI sous le EBP (PRJNA533106)"
+            "gb": "Assemblies retrieved from NCBI under CBP (PRJEB49670)",
+            "es-ct": "Assemblatges recuperats de NCBI sota la CBP (PRJEB49670)"
         }
     },
     "organisms": {
         "title": {
-            "gb": "Species sequenced under the EBP umbrella",
-            "es": "Especies secuenciadas bajo el EBP",
-            "es-ct": "Espècies seqüenciades sota l'EBP",
-            "fr": "Espèces séquencées dans le cadre de l'EBP"
+            "gb": "Organisms",
+            "es-ct": "Organismes"
         },
         "description": {
-            "gb": "INSDC submission status of species sequenced under the EBP umbrella",
-            "es": "Lista de especies secuenciadas bajo el paraguas del EBP",
-            "es-ct": "Llista d'espècies seqüenciades sota el paraigua de l'EBP",
-            "fr": "Liste des espèces séquencées sous l'égide de l'EBP"
+            "gb": "List of organisms currently targeted by the CBP",
+            "es-ct": "Llista d'organismes actualment objectiu del CBP"
         }
     }
 }
\ No newline at end of file
diff --git a/biogenome-client/src/App.vue b/biogenome-client/src/App.vue
index fca93183..8a3878b4 100644
--- a/biogenome-client/src/App.vue
+++ b/biogenome-client/src/App.vue
@@ -11,7 +11,7 @@ import config from '../configs/general.json'
 onMounted(() => {
   document.title = config.title
   if (config.tracker) {
-    const src = import.meta.env.VITE_BASE_PATH ? import.meta.env.VITE_BASE_PATH + `/tracking/${tracker}` : `/tracking/${tracker}`
+    const src = import.meta.env.VITE_BASE_PATH ? import.meta.env.VITE_BASE_PATH + `/tracking/${config.tracker}` : `/tracking/${config.tracker}`
     const trackerScript = document.createElement('script')
     trackerScript.setAttribute("type", "text/javascript")
     trackerScript.setAttribute("src", src)
diff --git a/biogenome-client/src/components/blocks/ChartsBlock.vue b/biogenome-client/src/components/blocks/ChartsBlock.vue
index 834816dd..93ba29f7 100644
--- a/biogenome-client/src/components/blocks/ChartsBlock.vue
+++ b/biogenome-client/src/components/blocks/ChartsBlock.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="row row-equal">
-        <div v-for="chart, index in charts" :key="index" :class="chart.class">
+        <div v-for="chart, index in charts" :key="`${index}-${chart.model}-${chart.field}`" :class="chart.class">
             <Suspense>
                 <template #default>
                     <va-card>
diff --git a/biogenome-client/src/components/blocks/FiltersBlock.vue b/biogenome-client/src/components/blocks/FiltersBlock.vue
index 31d41595..014ab2b0 100644
--- a/biogenome-client/src/components/blocks/FiltersBlock.vue
+++ b/biogenome-client/src/components/blocks/FiltersBlock.vue
@@ -1,16 +1,21 @@
 <template>
     <div class="row justify-space-between align-center">
         <div class="flex">
-            <div class="row">
-                <div class="flex">
-                    <VaBadge overlap color="info" :text="activeFilters.length">
-                        <FilterDropdown />
-
-                    </VaBadge>
-
+            <div class="row align-center">
+                <div v-if="modelFilterEntries.length" class="flex">
+                    <FilterDropdown />
                 </div>
                 <div class="flex">
-                    <VaMenu class="ml-2" :options="exportOptions" @selected="showModal">
+                    <VaMenu>
+                        <VaMenuItem v-if="isGoaTActive" @selected="downloadGoatReport">
+                            GoaT
+                        </VaMenuItem>
+                        <VaMenuItem @selected="itemStore.showTsvModal = !itemStore.showTsvModal">
+                            Report
+                        </VaMenuItem>
+                        <VaMenuItem @selected="itemStore.showChartModal = !itemStore.showChartModal">
+                            Chart
+                        </VaMenuItem>
                         <template #anchor>
                             <VaButton icon="cloud_download" preset="primary">Export</VaButton>
                         </template>
@@ -38,6 +43,9 @@ import { useItemStore } from '../../stores/items-store'
 import { useI18n } from 'vue-i18n'
 import ExportTSV from '../modals/ExportTSV.vue'
 import CreateChart from '../modals/CreateChart.vue'
+import general from '../../../configs/general.json'
+import GoaTService from '../../services/clients/GoaTService'
+
 const { t } = useI18n()
 
 const props = defineProps<{
@@ -47,21 +55,12 @@ const props = defineProps<{
 watch(() => props.hasCharts, () => {
     if (!props.hasCharts) itemStore.view = 'table'
 })
-type ExportType = {
-    text: string
-    icon: string
-    value: 'showTsvModal' | 'showChartModal'
-}
 
 const options = [
     { value: "table", icon: "table_rows", },
     { value: "charts", icon: "leaderboard", },
 ]
-
-const exportOptions = [
-    { text: 'TSV', value: 'showTsvModal', icon: 'download' },
-    { text: 'Chart', value: 'showChartModal', icon: 'insert_chart' },
-]
+const staticColumns = ['filter', 'sort_order', 'sort_column']
 
 const itemStore = useItemStore()
 
@@ -69,27 +68,53 @@ const model = computed(() => {
     return itemStore.currentModel
 })
 
-const isFiltering = computed(() => !!itemStore.stores[model.value].filter)
+const isGoaTActive = computed(() => {
+    return model.value === 'organisms' && general.goat
+})
+
+const isFiltering = computed(() => !!itemStore.stores[model.value].searchForm.filter)
 
 const total = computed(() => itemStore.stores[model.value].total)
 
-const activeFilters = computed(() => {
-    const entries = Object.entries(itemStore.stores[model.value].searchForm)
-    return entries.filter(([k, v]) => (v || v === false) && !['filter', 'sort_order', 'sort_column'].includes(k))
-})
+const modelFilterEntries = computed(() => Object.entries(itemStore.stores[model.value].searchForm)
+    .filter(([k, v]) => !staticColumns.includes(k)))
+
+const activeFilters = computed(() => modelFilterEntries.value
+    .filter(([k, v]) => (v || v === false))
+)
+
+
+async function downloadGoatReport() {
+    try {
+        const response = await GoaTService.getGoatReport()
+        const data = response.data
+        const href = URL.createObjectURL(data);
+
+        const filename = response.headers['content-disposition']
+        const match = filename.match(/filename=([^;]+)/);
+        let name = ''
+        if (match && match[1]) {
+            name = match[1];
+        } else {
+            name = 'file.tsv'
+            console.log("Filename not found in the string.");
+        }
+        // create "a" HTML element with href to file & click
+        const link = document.createElement('a');
+        link.href = href;
+        link.setAttribute('download', name); //or any other extension
+        document.body.appendChild(link);
+        link.click();
+        // clean up "a" element & remove ObjectURL
+        document.body.removeChild(link);
+        URL.revokeObjectURL(href);
+    } catch (err) {
+        console.error(err)
+        itemStore.toast({ message: 'Error downloading Goat Report', color: 'danger' })
+    }
 
-// pretty print label
-function getLabel(key: string) {
-    if (key.includes('metadata.')) {
-        const splittedKey = key.split('.')
-        return splittedKey[splittedKey.length - 1]
-    } else if (key.includes('_')) {
-        return key.split('_').join(' ')
-    } return key
-}
-function showModal(v: ExportType) {
-    itemStore[v.value] = !itemStore[v.value]
 }
+
 </script>
 <style>
 .w-200 {
diff --git a/biogenome-client/src/components/blocks/TableBlock.vue b/biogenome-client/src/components/blocks/TableBlock.vue
index a245e847..2457b577 100644
--- a/biogenome-client/src/components/blocks/TableBlock.vue
+++ b/biogenome-client/src/components/blocks/TableBlock.vue
@@ -3,7 +3,7 @@
         <div class="flex lg4 md6 sm12 xs12">
             <SearchInput :value="filter" @onSearchChange="debouncedUpdateSearch" />
         </div>
-        <div class="flex">
+        <div v-if="columns.length" class="flex">
             <ColumnDropdown />
         </div>
     </div>
@@ -39,18 +39,12 @@ import { useI18n } from 'vue-i18n'
 import { computed } from 'vue'
 import SearchInput from '../inputs/SearchInput.vue'
 import ColumnDropdown from '../dropdowns/ColumnDropdown.vue'
+import { useRouter } from 'vue-router'
 
+const router = useRouter()
 const { t } = useI18n()
 const itemStore = useItemStore()
 
-// const routeMap: Record<string, any> = {
-//     assemblies: { name: 'assembly', params: { accession: rowData.accession } },
-//     biosamples: { name: 'biosample', params: { accession: rowData.accession } },
-//     experiments: { name: 'experiment', params: { accession: rowData.experiment_accession } },
-//     organisms: { name: 'organism', params: { taxid: rowData.taxid } },
-//     local_samples: { name: 'local_sample', params: { id: rowData.local_id } },
-//     annotations: { name: 'annotation', params: { name: rowData.name } }
-// };
 const model = computed(() => {
     return itemStore.currentModel
 })
@@ -105,19 +99,16 @@ function debounce(fn: any, delay: number) {
     };
 }
 const handleClick = (event: any) => {
-
+    const { item } = event
+    const routeMap: Record<string, any> = {
+        assemblies: { name: 'assembly', params: { accession: item.accession } },
+        biosamples: { name: 'biosample', params: { accession: item.accession } },
+        experiments: { name: 'experiment', params: { accession: item.experiment_accession } },
+        organisms: { name: 'organism', params: { taxid: item.taxid } },
+        local_samples: { name: 'local_sample', params: { id: item.local_id } },
+        annotations: { name: 'annotation', params: { name: item.name } }
+    };
+    router.push(routeMap[model.value])
 }
 
-// function getRoute(rowData: Record<string, any>) {
-//         const routeMap: Record<string, any> = {
-//             assemblies: { name: 'assembly', params: { accession: rowData.accession } },
-//             biosamples: { name: 'biosample', params: { accession: rowData.accession } },
-//             experiments: { name: 'experiment', params: { accession: rowData.experiment_accession } },
-//             organisms: { name: 'organism', params: { taxid: rowData.taxid } },
-//             local_samples: { name: 'local_sample', params: { id: rowData.local_id } },
-//             annotations: { name: 'annotation', params: { name: rowData.name } }
-//         };
-
-//         return routeMap[props.model];
-//     }
 </script>
\ No newline at end of file
diff --git a/biogenome-client/src/components/cards/MetadataTreeCard.vue b/biogenome-client/src/components/cards/MetadataTreeCard.vue
index 9932f2cb..47165d72 100644
--- a/biogenome-client/src/components/cards/MetadataTreeCard.vue
+++ b/biogenome-client/src/components/cards/MetadataTreeCard.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="row">
-        <va-input class="flex" style="width: 200px;" v-model="filter" placeholder="Type to search" clearable>
+        <va-input class="flex" style="width: 300px;" v-model="filter" placeholder="Type to search" clearable>
             <template #appendInner>
                 <VaIcon name="search"></VaIcon>
             </template>
diff --git a/biogenome-client/src/components/common/PageHeader.vue b/biogenome-client/src/components/common/PageHeader.vue
index ecf97d82..4506dd3a 100644
--- a/biogenome-client/src/components/common/PageHeader.vue
+++ b/biogenome-client/src/components/common/PageHeader.vue
@@ -1,7 +1,11 @@
 <template>
-    <h1 v-if="title" class="va-h1">{{ title[mappedLocale] }}</h1>
-    <p v-if="description" style="margin-bottom: 6px" class="va-text-secondary">{{
-        description[mappedLocale] }}</p>
+    <div class="row align-end justify-space-between">
+        <div class="flex">
+            <h1 v-if="title" class="va-h1">{{ title[mappedLocale] }}</h1>
+            <p v-if="description" style="margin-bottom: 6px" class="va-text-secondary">{{
+                description[mappedLocale] }}</p>
+        </div>
+    </div>
 </template>
 <script setup lang="ts">
 import { LangOption } from '../../data/types'
diff --git a/biogenome-client/src/components/common/Tabs.vue b/biogenome-client/src/components/common/Tabs.vue
index caf30ad1..2498e7b2 100644
--- a/biogenome-client/src/components/common/Tabs.vue
+++ b/biogenome-client/src/components/common/Tabs.vue
@@ -29,10 +29,15 @@ const tabsKey = ref(0);  // A key to force re-rendering
 watch(
     () => props.tabs,
     (newTabs) => {
-        tabsKey.value++;  // Change the key to force re-render
+        console.log(newTabs)
+        console.log(currentTab.value)
         if (!newTabs.some(tab => tab.name === currentTab.value)) {
             currentTab.value = newTabs[0]?.name ?? '';
+            tabsKey.value++;  // Change the key to force re-render
+
             emits('updateView', currentTab.value)
+        } else {
+            emits('updateView', 'wiki')
         }
     },
     { immediate: true }
diff --git a/biogenome-client/src/components/dropdowns/FilterDropdown.vue b/biogenome-client/src/components/dropdowns/FilterDropdown.vue
index 28d1772e..1fee08be 100644
--- a/biogenome-client/src/components/dropdowns/FilterDropdown.vue
+++ b/biogenome-client/src/components/dropdowns/FilterDropdown.vue
@@ -1,19 +1,26 @@
 <template>
-    <VaButtonDropdown left-icon stickToEdges :closeOnContentClick="false" icon="tune" :label="t('buttons.filters')">
-        <div class="w-200">
-            <div class="p-4">
-                <p class="va-text-secondary">Filters apply to both table and chart view</p>
-            </div>
+    <VaBadge overlap color="info" :text="activeFilters.length">
+        <VaButtonDropdown preset="primary" left-icon stickToEdges :closeOnContentClick="false" icon="tune" :label="t('buttons.filters')">
+            <div class="w-200">
+                <div class="p-4">
+                    <p class="va-text-secondary">Filters apply to both table and chart view</p>
+                </div>
 
-            <div class="p-4" v-for="(field, index) in currentFilters" :key="index">
+                <div class="p-4" v-for="(field, index) in currentFilters" :key="index">
 
-                <component :is="getFieldComponent(field.type)" :value="getValue(field)" :label="getLabel(field.key)"
-                    :options="currentFrequencies[field.key]" :key="field.key" class="m-2"
-                    @valueChange="(v: any) => updateSearchForm(field, v)">
-                </component>
+                    <component :is="getFieldComponent(field.type)" :value="getValue(field)" :label="getLabel(field.key)"
+                        :options="currentFrequencies[field.key]" :key="field.key" class="m-2"
+                        @valueChange="(v: any) => updateSearchForm(field, v)">
+                    </component>
+                </div>
+                <div class="p-4">
+                    <VaButton :disabled="activeFilters.length === 0" @click="resetSearchForm" size="small"
+                        color="danger">Reset all
+                    </VaButton>
+                </div>
             </div>
-        </div>
-    </VaButtonDropdown>
+        </VaButtonDropdown>
+    </VaBadge>
 </template>
 
 <script setup lang="ts">
@@ -32,6 +39,8 @@ import { ConfigFilter } from '../../data/types';
 const { t } = useI18n();
 const itemStore = useItemStore();
 
+const staticColumns = ['filter', 'sort_order', 'sort_column']
+
 const model = computed(() => itemStore.currentModel as keyof typeof filtersConfig);
 
 const searchForm = computed(() => itemStore.stores[model.value].searchForm)
@@ -42,6 +51,14 @@ const { currentFilters, frequencies, fetchFrequencies, createFilters } = useFilt
 
 const currentFrequencies = computed(() => frequencies[model.value])
 // Watch for model changes and update filters
+
+const modelFilterEntries = computed(() => Object.entries(itemStore.stores[model.value].searchForm)
+    .filter(([k, v]) => !staticColumns.includes(k)))
+
+const activeFilters = computed(() => modelFilterEntries.value
+    .filter(([k, v]) => (v || v === false))
+)
+
 watch(() => model.value, async () => {
     createFilters(model.value)
 });
@@ -85,9 +102,19 @@ async function updateSearchForm(filter: ConfigFilter, value: any) {
         itemStore.stores[model.value].searchForm[key] = value;
     }
 
-    itemStore.resetPagination()
     await itemStore.fetchItems()
     await fetchFrequencies(model.value)
 }
 
+async function resetSearchForm() {
+    const { filter, sort_column, sort_order, ...entries } = itemStore.stores[model.value].searchForm
+    // Replace all values in `entries` with `null`
+    Object.keys(entries).forEach(key => {
+        entries[key] = null;
+    });
+    itemStore.stores[model.value].searchForm = { filter, sort_column, sort_order, ...entries }
+    itemStore.resetPagination()
+    await itemStore.fetchItems()
+    await fetchFrequencies(model.value)
+}
 </script>
diff --git a/biogenome-client/src/components/maps/LeafletMap.vue b/biogenome-client/src/components/maps/LeafletMap.vue
index 9772b01f..050ca404 100644
--- a/biogenome-client/src/components/maps/LeafletMap.vue
+++ b/biogenome-client/src/components/maps/LeafletMap.vue
@@ -1,28 +1,39 @@
 <template>
-  <div class="container">
-    <div v-if="showControls" class="controls">
-      <div v-if="showFilterInput" class="control-item">
-        <va-input @keyup.enter="search" style="min-width: 250px;" inner-label v-model="filter"
-          :label="t('buttons.search')" placeholder="Search by name or accession">
-          <template #appendInner>
-            <va-icon name="search" />
-          </template>
-        </va-input>
-      </div>
 
-      <div v-if="showSampleTypeSelect" class="control-item">
-        <va-select inner-label v-model="sampleType" label="Sample Type" :options="['local_sample', 'biosamples']" />
-      </div>
-
-      <div class="control-item">
-        <va-button :loading="isLoading" :disabled="isSubmitDisabled" :round="false" @click="search">
-          Submit
-        </va-button>
-      </div>
-      <div class="control-item">
-        <va-button :disabled="isLoading" :round="false" @click="reset" color="danger">
-          Reset
-        </va-button>
+  <div class="container">
+    <div class="controls">
+      <div class="row justify-space-between align-center">
+        <div class="flex">
+          <div v-if="showControls" class="row align-center">
+            <div class="flex">
+              <va-input @keyup.enter="search" style="min-width: 250px;" inner-label v-model="filter"
+                :label="t('buttons.search')" placeholder="Search by name or accession">
+                <template #appendInner>
+                  <va-icon name="search" />
+                </template>
+              </va-input>
+            </div>
+            <div v-if="showSampleTypeSelect" class="flex">
+              <va-select inner-label v-model="sampleType" label="Sample Type"
+                :options="['local_sample', 'biosamples']" />
+            </div>
+            <div class="flex">
+              <va-button :loading="isLoading" :disabled="isSubmitDisabled" :round="false" @click="search">
+                Submit
+              </va-button>
+            </div>
+            <div class="flex">
+              <va-button :loading="isLoading" :disabled="isSubmitDisabled" :round="false" @click="reset" color="danger">
+                Reset
+              </va-button>
+            </div>
+          </div>
+        </div>
+        <div class="flex">
+          <h4 class="va-h4">
+            {{ total }} Sample locations
+          </h4>
+        </div>
       </div>
     </div>
     <div class="map-container">
@@ -73,17 +84,14 @@ const hasBioSamples = computed(() => {
   return 'biosamples' in pages
 })
 const { init } = useToast()
+
 // Computed properties for conditions
 const showControls = computed(() => !props.taxid && !props.sample_accession);
-const showFilterInput = computed(() => !props.taxid);
 const showSampleTypeSelect = computed(() => !props.sample_accession && (hasLocalSamples.value && hasBioSamples.value));
 
 // Disable button logic
 const isSubmitDisabled = computed(() => {
-  return (
-    (!props.taxid && !filter.value) ||
-    (!props.sample_accession && hasLocalSamples.value && !sampleType.value)
-  )
+  return !filter.value && !sampleType.value
 });
 
 const L = window['L'];
diff --git a/biogenome-client/src/components/modals/CreateChart.vue b/biogenome-client/src/components/modals/CreateChart.vue
index edc8eed8..326f69ca 100644
--- a/biogenome-client/src/components/modals/CreateChart.vue
+++ b/biogenome-client/src/components/modals/CreateChart.vue
@@ -1,11 +1,12 @@
 <template>
-    <VaModal size="large" v-model="itemStore.showChartModal" hide-default-actions :title="t('buttons.chartDownload')">
+    <VaModal size="large" v-model="itemStore.showChartModal" hide-default-actions
+        :title="'Chart creation of ' + itemStore.currentModel">
         <div class="row">
-            <div class="flex">
+            <div class="flex lg6 m6 sm12 xs12">
                 <VaInput label="Field to query" v-model="chart.field" :messages="[fieldMessage]" />
             </div>
-            <div class="flex">
-                <VaSelect label="Chart type" v-model="chart.type" :options="types" />
+            <div class="flex lg4 m4 sm12 xs12">
+                <VaSelect style="padding-left: 6px;" label="Chart type" v-model="chart.type" :options="types" />
             </div>
         </div>
         <div class="row">
diff --git a/biogenome-client/src/components/tables/RelatedDataTable.vue b/biogenome-client/src/components/tables/RelatedDataTable.vue
new file mode 100644
index 00000000..12bed9f7
--- /dev/null
+++ b/biogenome-client/src/components/tables/RelatedDataTable.vue
@@ -0,0 +1,59 @@
+<template>
+    <VaDataTable @row:click="handleClick" clickable hoverable :items="data" :columns="columns">
+        <template v-for="column in columns" :key="column" v-slot:[`header(${column})`]="{ key }">
+            {{ key.split('.').length ? key.split('.')[key.split('.').length - 1] : key }}
+        </template>
+        <template #cell(gff_gz_location)="{ rowData }">
+            <va-chip :href="rowData.gff_gz_location">{{ t('buttons.download') }}</va-chip>
+        </template>
+        <template #cell(tab_index_location)="{ rowData }">
+            <va-chip :href="rowData.tab_index_location" size="small">{{ t('buttons.download') }}</va-chip>
+        </template>
+    </VaDataTable>
+</template>
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+import OrganismService from '../../services/clients/OrganismService'
+import BioSampleService from '../../services/clients/BioSampleService'
+import { computed } from 'vue';
+import columnsCongif from '../../../configs/columns.json'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+const { t } = useI18n()
+const cols = columnsCongif as Record<string, string[]>
+const props = defineProps<{
+    model: string,
+    taxid?: string
+    accession?: string
+}>()
+
+const { data } = props.taxid ?
+    await OrganismService.getOrganismRelatedData(props.taxid, props.model)
+    : await BioSampleService.getBioSampleRelatedData(props.accession, props.model)
+
+const columns = computed(() => {
+    if (props.model in cols) {
+        return cols[props.model]
+    } else if (props.model === 'sub_samples') {
+        return cols.biosamples
+    } else {
+        return []
+    }
+
+})
+
+const handleClick = (event: any) => {
+    const { item } = event
+    const routeMap: Record<string, any> = {
+        assemblies: { name: 'assembly', params: { accession: item.accession } },
+        biosamples: { name: 'biosample', params: { accession: item.accession } },
+        sub_samples: { name: 'biosample', params: { accession: item.accession } },
+        experiments: { name: 'experiment', params: { accession: item.experiment_accession } },
+        organisms: { name: 'organism', params: { taxid: item.taxid } },
+        local_samples: { name: 'local_sample', params: { id: item.local_id } },
+        annotations: { name: 'annotation', params: { name: item.name } }
+    };
+    router.push(routeMap[props.model])
+}
+</script>
\ No newline at end of file
diff --git a/biogenome-client/src/data/types.ts b/biogenome-client/src/data/types.ts
index 74faedb8..1d590bfe 100644
--- a/biogenome-client/src/data/types.ts
+++ b/biogenome-client/src/data/types.ts
@@ -3,6 +3,10 @@ import type { TChartData as ChartData } from 'vue-chartjs/dist/types'
 export type ColorThemes = {
   [key: string]: string
 }
+// Define the type for filters and columns objects
+export interface ConfigType {
+  [key: string]: any[]; // Adjust the type of values if necessary
+}
 
 export type TLineChartData = ChartData<'line'>
 export type TBarChartData = ChartData<'bar'>
diff --git a/biogenome-client/src/http-axios.js b/biogenome-client/src/http-axios.js
index 572115df..1e686e2e 100644
--- a/biogenome-client/src/http-axios.js
+++ b/biogenome-client/src/http-axios.js
@@ -21,7 +21,7 @@ const submitInstance = axios.create({
 })
 
 const ncbi = axios.create({
-  baseURL: 'https://api.ncbi.nlm.nih.gov/datasets/v1',
+  baseURL: 'https://api.ncbi.nlm.nih.gov/datasets/v2',
   headers: {
     'Content-type': 'application/json',
   },
diff --git a/biogenome-client/src/pages/biosamples/BioSample.vue b/biogenome-client/src/pages/biosamples/BioSample.vue
index b85bfcf8..e55f2947 100644
--- a/biogenome-client/src/pages/biosamples/BioSample.vue
+++ b/biogenome-client/src/pages/biosamples/BioSample.vue
@@ -5,7 +5,7 @@
     <div class="row">
       <div v-if="isDataModel(tab)" :key="tab" class="flex lg12 md12 sm12 xs12">
         <Suspense>
-          <!-- <BioSampleRelatedTable :accession="accession" :model="(tab as DataModel)" /> -->
+          <RelatedDataTable :accession="accession" :model="tab" />
           <template #fallback>
             <VaSkeleton height="500px"></VaSkeleton>
           </template>
@@ -14,7 +14,7 @@
       <div v-else-if="tab === 'map'" style="height: 450px;" class="flex lg12 md12 sm12 xs12">
         <LeafletMap :sample_accession="accession" />
       </div>
-      <div v-else-if="tab === 'metadata'" class="flex lg12 md12 sm12 xs12">
+      <div v-else class="flex lg12 md12 sm12 xs12">
         <MetadataTreeCard :metadata="metadata" />
       </div>
     </div>
@@ -30,7 +30,7 @@ import MetadataTreeCard from '../../components/cards/MetadataTreeCard.vue'
 import GeoLocationService from '../../services/clients/GeoLocationService'
 import LeafletMap from '../../components/maps/LeafletMap.vue'
 import { AxiosError } from 'axios'
-// import BioSampleRelatedTable from './components/BioSampleRelatedTable.vue'
+import RelatedDataTable from '../../components/tables/RelatedDataTable.vue'
 import { useToast } from 'vuestic-ui/web-components'
 import pages from '../../../configs/pages.json'
 
diff --git a/biogenome-client/src/pages/biosamples/components/BioSampleRelatedTable.vue b/biogenome-client/src/pages/biosamples/components/BioSampleRelatedTable.vue
deleted file mode 100644
index c88f3291..00000000
--- a/biogenome-client/src/pages/biosamples/components/BioSampleRelatedTable.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-    <VaDataTable :items="data" :columns="columns">
-        <template v-for="column in columns" :key="column"
-            v-slot:[`header(${column})`]="{ key }">
-            {{ key.split('.').length ? key.split('.')[key.split('.').length - 1] : key }}
-        </template>
-        <template #cell(actions)="{ rowData }">
-            <va-chip v-if="getRoute(rowData)" :to="getRoute(rowData)" size="small">{{ t('buttons.view') }}</va-chip>
-        </template>
-    </VaDataTable>
-</template>
-<script setup lang="ts">
-import { models } from '../../../../config.json'
-import { useI18n } from 'vue-i18n'
-import BioSampleService from '../../../services/clients/BioSampleService'
-import { computed } from 'vue';
-
-type DataModel = 'experiments' | 'sub_samples' | 'assemblies';
-
-const { t } = useI18n()
-
-const props = defineProps<{
-    model: DataModel,
-    accession: string
-}>()
-
-const { data } = await BioSampleService.getBioSampleRelatedData(props.accession, props.model)
-
-const columns = computed(() => {
-    if (props.model === 'sub_samples') return [...models.biosamples.columns, 'actions']
-    return [...models[props.model].columns, 'actions']
-})
-
-function getRoute(rowData: Record<string, any>) {
-    const routeMap: Record<string, any> = {
-        assemblies: { name: 'assembly', params: { accession: rowData.accession } },
-        sub_samples: { name: 'biosample', params: { accession: rowData.accession } },
-        experiments: { name: 'experiment', params: { accession: rowData.experiment_accession } },
-    };
-
-    return routeMap[props.model];
-}
-</script>
\ No newline at end of file
diff --git a/biogenome-client/src/pages/cms/CMSDashboard.vue b/biogenome-client/src/pages/cms/CMSDashboard.vue
index ea872f98..2d25f3bb 100644
--- a/biogenome-client/src/pages/cms/CMSDashboard.vue
+++ b/biogenome-client/src/pages/cms/CMSDashboard.vue
@@ -5,25 +5,25 @@
         <va-divider />
         <div class="row aling-end">
             <div class="flex">
-                <VaButton  color="secondary" icon="home" :to="{ name: 'cms-organisms' }"></VaButton>
+                <VaButton color="secondary" icon="home" :to="{ name: 'cms-organisms' }">Organisms </VaButton>
             </div>
             <div class="flex">
                 <va-menu :options="uploadOptions" @selected="(v: Record<string, any>) => $router.push(v.value)">
                     <template #anchor>
-                        <VaButton  color="info">Upload</VaButton>
+                        <VaButton color="info">Upload</VaButton>
                     </template>
                 </va-menu>
             </div>
             <div class="flex">
-                <VaButton  color="warning" :to="{ name: 'cms-local_samples' }">Local Samples</VaButton>
+                <VaButton color="warning" :to="{ name: 'cms-local_samples' }">Local Samples</VaButton>
             </div>
             <div class="flex">
-                <VaButton  color="success" :to="{ name: 'create-organism' }">New Organism</VaButton>
+                <VaButton color="success" :to="{ name: 'create-organism' }">New Organism</VaButton>
             </div>
             <div v-if="isAdmin" class="flex">
                 <va-menu :options="adminOptions" @selected="(v: Record<string, any>) => $router.push(v.value)">
                     <template #anchor>
-                        <VaButton >Options</VaButton>
+                        <VaButton>Options</VaButton>
                     </template>
                 </va-menu>
             </div>
@@ -34,9 +34,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { useGlobalStore } from '../../stores/global-store'
-import { useRouter } from 'vue-router'
 
-const router = useRouter()
 const { userName, userRole } = useGlobalStore()
 const uploadOptions = [
     { text: 'Spreadsheet (samples)', value: { name: 'spreadsheet-upload' } },
@@ -61,25 +59,3 @@ const adminOptions = [
 
 
 </script>
-<style lang="scss">
-.row-equal .flex {
-    .va-card {
-        height: 100%;
-    }
-}
-
-.dashboard {
-    .va-card {
-        margin-bottom: 0 !important;
-
-        &__title {
-            display: flex;
-            justify-content: space-between;
-        }
-    }
-}
-
-.chart {
-    height: 400px;
-}
-</style>
\ No newline at end of file
diff --git a/biogenome-client/src/pages/cms/organism/components/TaxidInput.vue b/biogenome-client/src/pages/cms/organism/components/TaxidInput.vue
index 6e42ea88..0ef01b89 100644
--- a/biogenome-client/src/pages/cms/organism/components/TaxidInput.vue
+++ b/biogenome-client/src/pages/cms/organism/components/TaxidInput.vue
@@ -30,7 +30,7 @@ const organismStore = useOrganismStore()
 
 watchEffect(async () => {
     try {
-        const { data } = await OrganismService.getOrganism(input.value)
+        await OrganismService.getOrganism(input.value)
         isValid.value = false
     } catch {
         isValid.value = true
@@ -50,8 +50,7 @@ async function getTaxonFromENA() {
         }
     } catch (error) {
         const axiosError = error as AxiosError
-        const message = 'Something went wrong'
-        init({ message: message, color: 'danger' })
+        init({ message: axiosError.message, color: 'danger' })
     } finally {
         isLoading.value = false
     }
diff --git a/biogenome-client/src/pages/common/Items.vue b/biogenome-client/src/pages/common/Items.vue
index b76105f1..2fdb0f89 100644
--- a/biogenome-client/src/pages/common/Items.vue
+++ b/biogenome-client/src/pages/common/Items.vue
@@ -6,26 +6,24 @@
                 <p v-if="config.description" style="margin-bottom: 6px" class="va-text-secondary">{{
         config.description[locale] }}</p>
             </div>
-            <div v-if="isGoaTActive" class="flex">
-                <VaButton @click="downloadGoatReport" :round="false" color="info" style="float: right">{{
-        t('buttons.goat_report') }}</VaButton>
-            </div>
         </div>
     </div>
-    <FiltersBlock :hasCharts="!!charts.length" />
-    <ChartsBlock :charts="charts" v-if="itemStore.view === 'charts'" />
-    <TableBlock v-else />
+    <FiltersBlock :hasCharts="charts.length > 0" />
+    <VaCard outlined>
+        <VaCardContent>
+            <ChartsBlock :charts="charts" v-if="itemStore.view === 'charts'" />
+            <TableBlock v-else />
+        </VaCardContent>
+    </VaCard>
 </template>
 
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
-import { computed, watchEffect } from 'vue'
-import { useRouter } from 'vue-router'
+import { computed, ref, watchEffect } from 'vue'
 import { InfoBlock, ModelConfig } from '../../data/types'
 import general from '../../../configs/general.json'
 import chartsConfig from '../../../configs/charts.json'
-
-import GoaTService from '../../services/clients/GoaTService'
+import { useRoute } from 'vue-router'
 import { useItemStore } from '../../stores/items-store'
 import ChartsBlock from '../../components/blocks/ChartsBlock.vue'
 import FiltersBlock from '../../components/blocks/FiltersBlock.vue'
@@ -37,17 +35,27 @@ const props = defineProps<{
 }>()
 
 const { t, locale } = useI18n()
-const router = useRouter()
+const route = useRoute()
 const itemStore = useItemStore()
+const isLoading = ref(false)
 
+watchEffect(() => {
+    const path = route.fullPath
+    if (!path.includes('taxonomy')) {
+        itemStore.parentTaxon = ""
+    }
+    if (!path.includes('countries')) {
+        itemStore.country = ""
+    }
+})
 const currentModel = computed(() => {
-    return props.model || router.currentRoute.value.name as keyof typeof chartsConfig
+    return props.model || route.name as keyof typeof chartsConfig
 })
 
-const charts = computed(() => chartsConfig[currentModel.value] as InfoBlock[])
+const charts = computed(() => chartsConfig[currentModel.value] ? chartsConfig[currentModel.value] as InfoBlock[] : [])
 
 const isGoaTActive = computed(() => {
-    return currentModel.value === 'status' && general.goat
+    return currentModel.value === 'organisms' && general.goat
 })
 
 
@@ -57,30 +65,5 @@ watchEffect(async () => {
 })
 
 
-async function downloadGoatReport() {
-    const response = await GoaTService.getGoatReport()
-    const data = response.data
-    const href = URL.createObjectURL(data);
-
-    const filename = response.headers['content-disposition']
-    const match = filename.match(/filename=([^;]+)/);
-    let name = ''
-    if (match && match[1]) {
-        name = match[1];
-    } else {
-        name = 'file.tsv'
-        console.log("Filename not found in the string.");
-    }
-    // create "a" HTML element with href to file & click
-    const link = document.createElement('a');
-    link.href = href;
-    link.setAttribute('download', name); //or any other extension
-    document.body.appendChild(link);
-    link.click();
-
-    // clean up "a" element & remove ObjectURL
-    document.body.removeChild(link);
-    URL.revokeObjectURL(href);
-}
 
 </script>
diff --git a/biogenome-client/src/pages/dashboard/DashboardPage.vue b/biogenome-client/src/pages/dashboard/DashboardPage.vue
index f4e268b5..eb8baa72 100644
--- a/biogenome-client/src/pages/dashboard/DashboardPage.vue
+++ b/biogenome-client/src/pages/dashboard/DashboardPage.vue
@@ -1,17 +1,15 @@
 <template>
   <div class="dashboard">
-    <PageHeader :title="dashboardInfo.title" :description="dashboardInfo.description" />
-    <VaDivider />
+    <PageHeader :title="(dashboardInfo.title as LangOption)" :description="(dashboardInfo.description as LangOption)" />
     <StatsBlock />
     <ChartsBlock v-if="configCharts.length" :charts="configCharts" />
-    <!-- <ExtraInfoBlock /> -->
   </div>
 </template>
 
 <script setup lang="ts">
 import ChartsBlock from '../../components/blocks/ChartsBlock.vue'
 import StatsBlock from '../../components/blocks/StatsBlock.vue'
-
+import { InfoBlock, LangOption } from '../../data/types'
 import pages from '../../../configs/pages.json'
 import charts from '../../../configs/charts.json'
 import { computed } from 'vue'
@@ -25,7 +23,8 @@ const dashboardInfo = computed(() => {
 
 
 const configCharts = computed(() => {
-  return charts.dashboard || []
+  const dashCharts = charts.dashboard ? charts.dashboard as InfoBlock[] : []
+  return dashCharts
 })
 
 </script>
diff --git a/biogenome-client/src/pages/maps/3DCountries.vue b/biogenome-client/src/pages/maps/3DCountries.vue
index 93e175c0..a1a2a9af 100644
--- a/biogenome-client/src/pages/maps/3DCountries.vue
+++ b/biogenome-client/src/pages/maps/3DCountries.vue
@@ -2,7 +2,6 @@
   <div>
     <h1 class="va-h1">{{ t('maps.countries.title') }}</h1>
     <p class="va-text-secondary">{{ t('maps.countries.description') }}</p>
-    <va-divider />
     <VaSplit class="split-demo" :limits="[10, 10]">
       <template #start>
         <div style="position: relative;height: 100%;">
diff --git a/biogenome-client/src/pages/maps/SamplesMap.vue b/biogenome-client/src/pages/maps/SamplesMap.vue
index fd2d3bc7..05109d9d 100644
--- a/biogenome-client/src/pages/maps/SamplesMap.vue
+++ b/biogenome-client/src/pages/maps/SamplesMap.vue
@@ -1,7 +1,6 @@
 <template>
   <h1 class="va-h1">{{ t('maps.samples-map.title') }}</h1>
   <p class="va-text-secondary">{{ t('maps.samples-map.description') }}</p>
-  <va-divider />
   <div style="height: 90vh;" class="row row-equal">
     <div class="flex lg12 md12 sm12 xs12">
       <LeafletMap :lineage="rootNode" />
diff --git a/biogenome-client/src/pages/organisms/Organism.vue b/biogenome-client/src/pages/organisms/Organism.vue
index 224f49f6..d1f3f488 100644
--- a/biogenome-client/src/pages/organisms/Organism.vue
+++ b/biogenome-client/src/pages/organisms/Organism.vue
@@ -36,7 +36,7 @@ import VernacularNames from './components/VernacularNames.vue'
 import GeoLocationService from '../../services/clients/GeoLocationService'
 import LeafletMap from '../../components/maps/LeafletMap.vue'
 import Images from './components/Images.vue'
-import RelatedDataTable from './components/RelatedDataTable.vue'
+import RelatedDataTable from '../../components/tables/RelatedDataTable.vue'
 import { AxiosError } from 'axios'
 import { useToast } from 'vuestic-ui/web-components'
 import pages from '../../../configs/pages.json'
diff --git a/biogenome-client/src/pages/organisms/components/RelatedDataTable.vue b/biogenome-client/src/pages/organisms/components/RelatedDataTable.vue
deleted file mode 100644
index 6efa0ff6..00000000
--- a/biogenome-client/src/pages/organisms/components/RelatedDataTable.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-    <VaDataTable :items="data" :columns="columns">
-        <template v-for="column in columns" :key="column" v-slot:[`header(${column})`]="{ key }">
-            {{ key.split('.').length ? key.split('.')[key.split('.').length - 1] : key }}
-        </template>
-        <template #cell(actions)="{ rowData }">
-            <va-chip v-if="getRoute(rowData)" :to="getRoute(rowData)" size="small">{{ t('buttons.view') }}</va-chip>
-        </template>
-        <template #cell(gff_gz_location)="{ rowData }">
-            <va-chip :href="rowData.gff_gz_location">{{ t('buttons.download') }}</va-chip>
-        </template>
-        <template #cell(tab_index_location)="{ rowData }">
-            <va-chip :href="rowData.tab_index_location" size="small">{{ t('buttons.download') }}</va-chip>
-        </template>
-    </VaDataTable>
-</template>
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n'
-import OrganismService from '../../../services/clients/OrganismService'
-import { computed } from 'vue';
-import columnsCongif from '../../../../configs/columns.json'
-
-const { t } = useI18n()
-
-const props = defineProps<{
-    model: string,
-    taxid: string
-}>()
-
-const { data } = await OrganismService.getOrganismRelatedData(props.taxid, props.model)
-
-const columns = computed(() => {
-
-    const currentModel = Object.entries(columnsCongif).find(([key, value]) => key === props.model)
-    if (currentModel) return currentModel[0][1]
-    return []
-})
-
-function getRoute(rowData: Record<string, any>) {
-    const routeMap: Record<string, any> = {
-        assemblies: { name: 'assembly', params: { accession: rowData.accession } },
-        biosamples: { name: 'biosample', params: { accession: rowData.accession } },
-        experiments: { name: 'experiment', params: { accession: rowData.experiment_accession } },
-        organisms: { name: 'organism', params: { taxid: rowData.taxid } },
-        local_samples: { name: 'local_sample', params: { id: rowData.local_id } },
-        annotations: { name: 'annotation', params: { name: rowData.name } }
-    };
-
-    return routeMap[props.model];
-}
-</script>
\ No newline at end of file
diff --git a/biogenome-client/src/pages/taxonomy/Taxon.vue b/biogenome-client/src/pages/taxonomy/Taxon.vue
index a769a0e8..0157a124 100644
--- a/biogenome-client/src/pages/taxonomy/Taxon.vue
+++ b/biogenome-client/src/pages/taxonomy/Taxon.vue
@@ -5,16 +5,21 @@
             <VaCardContent v-if="taxonomyStore.currentTaxon">
                 <Header :name="taxonomyStore.currentTaxon.name" />
             </VaCardContent>
-            <Tabs :tabs="validTabs" :tab="tab" @update-view="(v: string) => tab = v" />
-            <VaCardContent :key="taxid">
+            <VaTabs :key="validTabs.length" v-model="tab" @update:model-value="updateView">
+                <template #tabs>
+                    <VaTab name="wiki" key="wiki">
+                        {{ t('tabs.wiki') }}
+                    </VaTab>
+                    <VaTab :name="validTab.name" v-for="validTab in validTabs" :key="validTab.name">
+                        {{ t(validTab.label) }}
+                    </VaTab>
+                </template>
+            </VaTabs>
+            <VaDivider style="margin: 0;"></VaDivider>
+            <VaCardContent :key="lineage">
                 <div class="row">
                     <div style="min-height: 450px;" class="flex lg12 md12 sm12 xs12">
                         <router-view v-if="taxonomyStore.currentTaxon"></router-view>
-                        <!-- <ItemsBlock v-if="isDataModel(tab)" :parent_taxon="taxid"
-                            :columns="models[tab as DataModel].columns"
-                            :filters="(models[tab as DataModel].filters as Filter[])" :model="(tab as DataModel)" />
-                        <LeafletMap v-else-if="tab === 'map'" :lineage="taxid" />
-                        <Wikipedia v-else /> -->
                     </div>
                 </div>
             </VaCardContent>
@@ -24,20 +29,23 @@
 <script setup lang="ts">
 import { onMounted, ref, watchEffect } from 'vue'
 import GeoLocationService from '../../services/clients/GeoLocationService'
-import LeafletMap from '../../components/maps/LeafletMap.vue'
-import Wikipedia from './components/Wikipedia.vue'
 import { useTaxonomyStore } from '../../stores/taxonomy-store'
 import { AxiosError } from 'axios';
 import { useToast } from 'vuestic-ui/web-components';
 import TaxonService from '../../services/clients/TaxonService'
-import Tabs from '../../components/common/Tabs.vue'
 import Header from './components/Header.vue'
+import { useRouter, useRoute } from 'vue-router'
+import { useItemStore } from '../../stores/items-store'
+import { useI18n } from 'vue-i18n'
 
+const { t } = useI18n()
+const itemStore = useItemStore()
 const { init } = useToast()
 const taxonomyStore = useTaxonomyStore()
-
+const router = useRouter()
+const route = useRoute()
 const props = defineProps<{
-    taxid: string
+    lineage: string
 }>()
 
 const coordinates = ref(0)
@@ -49,12 +57,22 @@ const tab = ref('')
 const isLoading = ref(false)
 
 watchEffect(async () => {
-    await getTaxon(props.taxid)
-    await getStats(props.taxid)
-    await getCoordinates(props.taxid)
+    await getTaxon(props.lineage)
+    await getStats(props.lineage)
+    await getCoordinates(props.lineage)
+    itemStore.parentTaxon = props.lineage
     setTabs()
+    const currentRoute = route.name as string;
+    if (currentRoute === 'map') {
+        tab.value = 'map';
+    } else if (route.params.model) {
+        tab.value = route.params.model as string;
+    } else {
+        tab.value = 'wiki'
+    }
 })
 
+
 onMounted(async () => {
     if (!taxonomyStore.treeData) await taxonomyStore.getTree()
 })
@@ -62,7 +80,7 @@ onMounted(async () => {
 const validTabs = ref<{ label: string, name: string }[]>([])
 
 function setTabs() {
-    const t = [{ name: 'wiki', label: 'tabs.wiki' }]
+    const t = []
     if (currentTaxonStats.value) {
         const tabs = Object.entries(currentTaxonStats.value).filter(([k, v]) => v)
             .map(([k, v]) => { return { name: k, label: `tabs.${k}` } })
@@ -71,7 +89,13 @@ function setTabs() {
     if (coordinates.value) t.push({ name: 'map', label: 'tabs.map' })
     validTabs.value = [...t]
 }
-
+function updateView(v: string) {
+    tab.value = v
+    if (!v) return
+    if (v === 'wiki') router.push({ name: 'wiki' })
+    else if (v === 'map') router.push({ name: 'map' })
+    else router.push({ name: 'items', params: { model: v } })
+}
 async function getStats(taxid: string) {
     currentTaxonStats.value = undefined
     const { data } = await TaxonService.getTaxonStats(taxid)
diff --git a/biogenome-client/src/pages/taxonomy/Taxonomy.vue b/biogenome-client/src/pages/taxonomy/Taxonomy.vue
index 18b825f2..46b31642 100644
--- a/biogenome-client/src/pages/taxonomy/Taxonomy.vue
+++ b/biogenome-client/src/pages/taxonomy/Taxonomy.vue
@@ -1,24 +1,23 @@
 <template>
     <h1 class="va-h1">{{ t('taxon.title') }}</h1>
     <p class="va-text-secondary" style="margin-bottom: 6px">{{ t('taxon.description') }}</p>
-    <VaDivider />
     <div class="row align-end">
         <div class="flex">
-            <va-select hideSelected :loading="isLoading" dropdownIcon="search" searchable highlight-matched-text
+            <VaButton @click="taxonomyStore.showTree = !taxonomyStore.showTree" :loading="taxonomyStore.isTreeLoading">
+                {{ taxonomyStore.showTree ? t('taxon.search.hide') : t('taxon.search.show') }}
+            </VaButton>
+        </div>
+        <div class="flex lg4 md6 sm12 xs12">
+            <VaSelect hideSelected :loading="isLoading" dropdownIcon="search" searchable highlight-matched-text
                 :textBy="(v: TreeNode) => `${v.name} (${v.rank})`" trackBy="taxid" @update:model-value="setCurrentTaxon"
                 @update:search="taxonomyStore.handleSearch" v-model="taxonomyStore.currentTaxon"
                 :searchPlaceholderText="t('taxon.search.placeholder')" :noOptionsText="t('taxon.search.noOptions')"
                 :options="taxonomyStore.taxons">
-            </va-select>
-        </div>
-        <div class="flex">
-            <VaButton color="primary" :round="false" @click="taxonomyStore.showTree = !taxonomyStore.showTree"
-                :loading="taxonomyStore.isTreeLoading">
-                {{ taxonomyStore.showTree ? t('taxon.search.hide') : t('taxon.search.show') }}
-            </VaButton>
+            </VaSelect>
         </div>
         <div class="flex">
-            <VaButton color="info" :round="false" @click="router.push({ name: 'taxon', params: { taxid: rootNode } })">
+            <VaButton :disabled="taxonomyStore.taxidQuery === rootNode" preset="primary"
+                @click="router.push({ name: 'wiki', params: { lineage: rootNode } })">
                 {{ t('taxon.search.rootLoad') }}
             </VaButton>
         </div>
@@ -34,7 +33,7 @@
 </template>
 <script setup lang="ts">
 import D3HyperTree from '../../components/tree/D3HyperTree.vue'
-import { onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n'
 import { useTaxonomyStore } from '../../stores/taxonomy-store'
 import { TreeNode } from '../../data/types';
@@ -46,13 +45,19 @@ const rootNode = import.meta.env.VITE_ROOT_NODE ? import.meta.env.VITE_ROOT_NODE
 
 
 onMounted(() => {
-    if (route.params.taxid) {
-        taxonomyStore.taxidQuery = route.params.taxid as string
+    if (route.params.lineage) {
+        taxonomyStore.taxidQuery = route.params.lineage as string
     }
 })
 
 const taxonomyStore = useTaxonomyStore()
 
+const treeDataExists = computed(() => !!taxonomyStore.treeData)
+
+watch(() => treeDataExists.value, () => {
+    if (treeDataExists.value) taxonomyStore.showTree = true
+})
+
 const { t } = useI18n()
 
 const isLoading = ref(false)
@@ -61,7 +66,7 @@ function setCurrentTaxon(taxon: TreeNode) {
     taxonomyStore.taxons = []
     taxonomyStore.currentTaxon = { ...taxon }
     taxonomyStore.taxidQuery = taxon.taxid
-    router.push({ name: 'taxon', params: { taxid: taxon.taxid } })
+    router.push({ name: 'wiki', params: { lineage: taxon.taxid } })
 }
 
 
@@ -93,7 +98,7 @@ function setCurrentTaxon(taxon: TreeNode) {
     flex: 0 0 50%;
     /* Occupies 50% of the width */
     max-width: 50%;
-    transition: all 0.5s ease;
+    transition: all 0.7s ease;
     overflow: hidden;
     transform: translateX(0);
     /* Starts in view */
@@ -112,7 +117,7 @@ function setCurrentTaxon(taxon: TreeNode) {
     flex: 1;
     max-width: 50%;
     /* Occupies remaining space */
-    transition: all 0.5s ease;
+    transition: all 0.7s ease;
 }
 
 .content-container.full-width {
diff --git a/biogenome-client/src/router/index.ts b/biogenome-client/src/router/index.ts
index 8c2c68fd..26bdee90 100644
--- a/biogenome-client/src/router/index.ts
+++ b/biogenome-client/src/router/index.ts
@@ -24,12 +24,12 @@ const defaultRoutes: Array<RouteRecordRaw> = [
       {
         name: 'taxonomy',
         path: '',
-        redirect: { name: 'taxon', params: { taxid: rootNode } },
+        redirect: { name: 'wiki', params: { lineage: rootNode } },
         meta: { name: 'taxonomy' }
       },
       {
         name: 'taxon',
-        path: ':taxid',
+        path: ':lineage',
         props: true,
         component: () => import('../pages/taxonomy/Taxon.vue'),
         meta: { name: 'taxonomy' },
@@ -38,7 +38,6 @@ const defaultRoutes: Array<RouteRecordRaw> = [
             name: 'wiki',
             path: '',
             props: true,
-
             component: () => import('../pages/taxonomy/components/Wikipedia.vue')
           },
           {
diff --git a/biogenome-client/src/services/clients/ENAClientService.js b/biogenome-client/src/services/clients/ENAClientService.js
index 6d5aa415..d572c388 100644
--- a/biogenome-client/src/services/clients/ENAClientService.js
+++ b/biogenome-client/src/services/clients/ENAClientService.js
@@ -5,7 +5,7 @@ const ena = http.ena.enaApi
 ///see https://www.ebi.ac.uk/ena/portal/api/#/
 class ENAClientService {
   getTaxon(taxonId) {
-    return ena.get(`/ena/portal/api/links/taxon?accession=${taxonId}&format=JSON&result=taxon`)
+    return ena.get(`/ena/portal/api/search?result=taxon&query=tax_id%3D${taxonId}&limit=10&format=json`)
   }
 
   getBioSample(accession) {
diff --git a/biogenome-client/src/stores/items-store.ts b/biogenome-client/src/stores/items-store.ts
index a59e0bef..44adb694 100644
--- a/biogenome-client/src/stores/items-store.ts
+++ b/biogenome-client/src/stores/items-store.ts
@@ -1,13 +1,18 @@
 import { defineStore } from 'pinia'
-import { Filter, ErrorResponseData, ConfigFilter } from '../data/types'
+import { ErrorResponseData, ConfigFilter, ConfigType } from '../data/types'
 import { useToast } from 'vuestic-ui'
 import CommonService from '../services/clients/CommonService'
 import StatisticsService from '../services/clients/StatisticsService'
 import filters from '../../configs/filters.json'
 import columns from '../../configs/columns.json'
-
 import { AxiosError } from 'axios'
 
+
+const columnsConf = columns as ConfigType
+const filtersConf = filters as ConfigType
+
+const MODELS = ['organisms', 'biosamples', 'assemblies', 'experiments', 'annotations', 'local_samples']
+
 const staticFilters = {
     filter: "",
     sort_order: "",
@@ -18,9 +23,10 @@ const initPagination = {
     limit: 10,
 }
 
-function mapSearchForm(filters: ConfigFilter[]) {
+function mapSearchForm(modelFilters: ConfigFilter[]) {
 
-    const formEntries = filters.map(f => {
+    const staticEntries = Object.entries(staticFilters)
+    const formEntries = modelFilters.map(f => {
         if (f.type === "date") {
             return [[`${f.key}__gte`, null], [`${f.key}__lte`, null]]
         } else if (f.type === "checkbox") {
@@ -29,22 +35,24 @@ function mapSearchForm(filters: ConfigFilter[]) {
         return [[f.key, null]]
     }).flat()
 
-    return Object.fromEntries(formEntries)
+    return Object.fromEntries([...formEntries, ...staticEntries])
 }
 
 
 //add configs in each store to manage everything from here
-function mapModelStore(value: ConfigFilter[], key: keyof typeof filters) {
+function mapModelStore(m: string) {
+
+    const columnsToShow = m in columnsConf ? columnsConf[m] : []
+
+    const modelFilters = m in filtersConf ? filtersConf[m] : []
+
+    const searchForm = mapSearchForm(modelFilters)
 
-    const searchForm = mapSearchForm(value)
-    const tableFilters = { ...staticFilters }
-    const columnsToShow = [...columns[key]] //show all columns by default
     const pagination = { ...initPagination }
     const items: Record<string, any>[] = []
     const total = 0
     return {
         searchForm,
-        tableFilters,
         pagination,
         items,
         total,
@@ -55,11 +63,10 @@ function mapModelStore(value: ConfigFilter[], key: keyof typeof filters) {
 
 export const useItemStore = defineStore('item', {
     state: () => {
-        const mappedEntries = Object.entries(filters).map(([key, value]) => {
-            return [key, mapModelStore(value as ConfigFilter[], key as keyof typeof filters)]
-        })
 
-        const stores = Object.fromEntries(mappedEntries)
+        const mappedStores = MODELS.map(m => [m, mapModelStore(m)])
+
+        const stores = Object.fromEntries(mappedStores)
         return {
             view: 'table' as 'table' | 'charts',
             stores: { ...stores },
@@ -88,6 +95,9 @@ export const useItemStore = defineStore('item', {
                 //filter out filter, and sort fields
                 const filteredEntries = Object.entries(this.stores[model].searchForm).filter(([k, v]) => !Object.keys(staticFilters).includes(k))
                 const query = Object.fromEntries(filteredEntries)
+                if (this.country) query['countries'] = this.country
+                if (this.parentTaxon) query['taxon_lineage'] = this.parentTaxon
+
                 const { data } = await StatisticsService.getModelFieldStats(model, field, query)
                 return data
             } catch (err) {
@@ -142,6 +152,13 @@ export const useItemStore = defineStore('item', {
             const downloadRequest = { format: "tsv", fields: [...fields] }
             try {
                 const requestData = applyFilters ? { ...this.stores[model].searchForm, ...downloadRequest } : { ...downloadRequest }
+                if (this.country) {
+                    requestData['countries'] = this.country
+                }
+                if (this.parentTaxon) {
+                    requestData['taxon_lineage'] = this.parentTaxon
+                }
+
                 const response = await CommonService.getTsv(`/${model}`, requestData)
                 const data = response.data
                 const href = URL.createObjectURL(data);
diff --git a/biogenome-client/vuestic.config.ts b/biogenome-client/vuestic.config.ts
index d6c905d4..2e2172a8 100644
--- a/biogenome-client/vuestic.config.ts
+++ b/biogenome-client/vuestic.config.ts
@@ -2,8 +2,9 @@ import { defineVuesticConfig } from 'vuestic-ui'
 import ui from './configs/ui.json'
 import iconsConfig from './vuestic-ui/icons-config/icons-config'
 
+const UI = ui ? ui : {}
 export default defineVuesticConfig({
     // Config here
     icons: iconsConfig,
-    ...ui
+    ...UI
 })
\ No newline at end of file
diff --git a/mongo-restore.sh b/mongo-restore.sh
deleted file mode 100644
index 31d3921c..00000000
--- a/mongo-restore.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/bash
-set -e
-
-mongorestore --gzip --archive=./db-dump/${DB_DUMP} --db=${DB_NAME}
\ No newline at end of file
diff --git a/server/static/README.txt b/server/static/README.txt
deleted file mode 100644
index 00bc48aa..00000000
--- a/server/static/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Placeholder folder for precomuputed large datasets
\ No newline at end of file