diff --git a/src/components/FormInputs/OcKeywordAutocomplete/OcKeywordAutocomplete.vue b/src/components/FormInputs/OcKeywordAutocomplete/OcKeywordAutocomplete.vue
index 49194cea1c55d84ffeb7581efe95b7815a2ec82f..00cc8212d8a13f6b07820b633ccb0547c832f399 100644
--- a/src/components/FormInputs/OcKeywordAutocomplete/OcKeywordAutocomplete.vue
+++ b/src/components/FormInputs/OcKeywordAutocomplete/OcKeywordAutocomplete.vue
@@ -17,7 +17,7 @@ import AutoComplete from 'primevue/autocomplete'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-const model = defineModel<string[] | undefined>()
+const model = defineModel<string[] | undefined | null>()
 
 const { locale } = useI18n()
 const loading = ref<boolean>(false)
@@ -38,7 +38,7 @@ const addCustomValue = (event: KeyboardEvent) => {
   const value = (event.target as HTMLInputElement).value
 
   if (value) {
-    if (model.value === undefined) {
+    if (model.value == null) {
       model.value = [value]
     } else if (!model.value.includes(value)) {
       model.value.push(value)
diff --git a/src/components/descriptors/OcDescriptorResource/OcDescriptorResource.vue b/src/components/descriptors/OcDescriptorResource/OcDescriptorResource.vue
index 6bf16b0d791bc0f34d32c674160347be63461e9f..5f708b974280b9270c8fa3d52f623112176243df 100644
--- a/src/components/descriptors/OcDescriptorResource/OcDescriptorResource.vue
+++ b/src/components/descriptors/OcDescriptorResource/OcDescriptorResource.vue
@@ -10,7 +10,12 @@
           :href="shareLink"
         />
         <Button
-          v-if="resource?.identifier && can('read', community) && can('update', resource) && router.hasRoute(updateRoute.name)"
+          v-if="
+            resource?.identifier &&
+            can('read', community) &&
+            can('update', resource) &&
+            router.hasRoute(updateRoute.name)
+          "
           size="small"
           :as="OcLink"
           :to="updateRoute"
@@ -162,7 +167,7 @@
               v-if="spatialGeometry.length"
               :spatial-items="spatialGeometry"
             />
-            <div v-if="spatialConcepts.length" class="flex gap-2">
+            <div v-if="spatialConcepts.length" class="flex flex-wrap gap-2">
               <span
                 class="rounded bg-slate-200 border border-slate-500 text-black font-medium px-2 py-1"
                 v-for="spatialConcept in spatialConcepts"
diff --git a/src/sparql/datasets.ts b/src/sparql/datasets.ts
index 522ba168cf8602eb542c7e8bcbb81ba73c3118e3..cf925b690745d19bb396394648f66e308e4d6e13 100644
--- a/src/sparql/datasets.ts
+++ b/src/sparql/datasets.ts
@@ -133,7 +133,7 @@ function buildDatasetTriples(dataset: OcDataset, profile: OcPerson) {
               dcat:hadRole <https://www.irit.fr/opencommon/terms/dataStewardRole>
             ]`
 
-  if (dataset.keyword && dataset.keyword.length) {
+  if (dataset.keyword) {
     const keywords: string = formatLocalizedProperty<string[]>(dataset.keyword, (item, locale) => {
       return item.map((item) => defaultLocalizedPropFormatter(item, locale)).join(', ')
     })
@@ -657,7 +657,6 @@ export async function getDataset(identifier: string, auth?: Credentials): Promis
   dataset.accrualPeriodicity = datasetResponse[11][0]
   dataset.license = datasetResponse[12][0]
   dataset.conformsTo = datasetResponse[13][0]
-  dataset.spatial = datasetResponse[14]
 
   // Format Dates
   // dataset.issued = dataset.issued ? new Date(Date.parse(dataset.issued)) : dataset.issued