diff --git a/build.gradle.kts b/build.gradle.kts
index cca92c5e..39a89c78 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -59,7 +59,7 @@ dependencies {
 
     implementation("org.xerial:sqlite-jdbc")
     implementation("org.liquibase:liquibase-core")
-    val exposedVersion = "0.41.1"
+    val exposedVersion = "0.43.0"
     implementation("org.jetbrains.exposed:exposed-spring-boot-starter:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
 // 	implementation("org.nuvito.spring.data:sqlite-dialect:1.0-SNAPSHOT")
diff --git a/src/jelu-ui/src/assets/style.css b/src/jelu-ui/src/assets/style.css
index 50d73c70..4a28039b 100644
--- a/src/jelu-ui/src/assets/style.css
+++ b/src/jelu-ui/src/assets/style.css
@@ -100,7 +100,6 @@
   @apply radio radio-primary radio-sm bg-none;
 }
 
-
 .o-pag__link {
   @apply btn text-neutral-content !important;
 }
@@ -141,6 +140,18 @@
   @apply text-gray-700;
 }
 
+.o-ctrl-input > input[type="number"] {
+  @apply w-24;
+}
+
+.o-acp .o-ctrl-input .o-input {
+  @apply w-fit sm:w-full bg-base-100 text-base-content border-base-200 focus:input-accent grow;
+}
+
+.o-acp {
+  @apply grow !important;
+}
+
 /* end oruga customization with daisyui */
 
 .swal2-container {
@@ -346,3 +357,7 @@
 .jelu-cursor-text {
   @apply cursor-text !important;
 }
+
+.jl-formkit .o-input {
+  @apply w-fit sm:w-full bg-base-100 text-base-content border-primary focus:input-accent;
+}
diff --git a/src/jelu-ui/src/components/AddBook.vue b/src/jelu-ui/src/components/AddBook.vue
index 5d41dc20..21c9ad3a 100644
--- a/src/jelu-ui/src/components/AddBook.vue
+++ b/src/jelu-ui/src/components/AddBook.vue
@@ -15,6 +15,8 @@ import { key } from '../store';
 import { ObjectUtils } from "../utils/ObjectUtils";
 import { StringUtils } from "../utils/StringUtils";
 import AutoImportFormModalVue from "./AutoImportFormModal.vue";
+import { SeriesOrder } from "../model/Series";
+import SeriesInput from "./SeriesInput.vue";
 
 const { t } = useI18n({
       inheritLocale: true,
@@ -37,9 +39,6 @@ const form = reactive({
   isbn13: "",
   publisher: "",
   pageCount: null,
-  // publishedDate: <Date> null,
-  series: "",
-  numberInSeries: null,
   personalNotes: "",
   owned: null,
   borrowed: null,
@@ -94,9 +93,11 @@ let tags: Ref<Array<Tag>> = ref([]);
 let translators: Ref<Array<Author>> = ref([]);
 let filteredTranslators: Ref<Array<Author>> = ref([]);
 
+let seriesCopy: Ref<Array<SeriesOrder>> = ref([])
+
 const showModal: Ref<boolean> = ref(false)
 const metadata: Ref<Metadata | null> = ref(null)
-// let hasImage: Ref<boolean> = ref(metadata?.value?.image != null)
+
 let hasImage = computed(() => {
   return StringUtils.isNotBlank(metadata.value?.image)
 })
@@ -136,10 +137,16 @@ const importBook = async () => {
     authors.value.forEach((a) => userBook.book.authors?.push(a));
     tags.value.forEach((t) => userBook.book.tags?.push(t));
     translators.value.forEach((tr) => userBook.book.translators?.push(tr));
+    seriesCopy.value.forEach((s) => {
+      if (s.name.trim().length > 0) {
+        userBook.book.series?.push(s)
+      }
+    })
     if (StringUtils.isNotBlank(imageUrl.value)) {
       userBook.book.image = imageUrl.value;
     }
     else if (!deleteImage.value
+      && metadata.value != null
       && metadata.value?.image != null
       && StringUtils.isNotBlank(metadata.value.image)) {
       userBook.book.image = metadata.value.image
@@ -171,7 +178,6 @@ const importBook = async () => {
       await router.push({name: 'my-books'})
     } catch (error: any) {
       progress.value = false
-      // errorMessage.value = error.message
       ObjectUtils.toast(oruga, "danger", t('labels.error_message', {msg : error.message}), 4000)
     }
   } else {
@@ -190,8 +196,7 @@ const fillBook = (formdata: any, publishedDate: Date | null): UserBook => {
       image: formdata.image,
       pageCount: formdata.pageCount,
       publishedDate: publishedDate?.toISOString(),
-      series: formdata.series,
-      numberInSeries: formdata.numberInSeries,
+      series: [],
       googleId: formdata.googleId,
       amazonId: formdata.amazonId,
       goodreadsId: formdata.goodreadsId,
@@ -225,11 +230,9 @@ const clearForm = () => {
   form.isbn13 = "";
   form.publisher = "";
   form.pageCount = null;
-  // form.publishedDate = null;
   publishedDate.value = null
-  form.series = ""
+  seriesCopy.value = []
   form.language = ""
-  form.numberInSeries = null
   form.owned = null
   form.personalNotes = ""
   form.amazonId = ""
@@ -241,7 +244,6 @@ const clearForm = () => {
 
 const clearDatePicker = () => {
   // close datepicker on reset
-  // form.publishedDate = null;
   publishedDate.value = null
 };
 
@@ -382,6 +384,8 @@ function modalClosed() {
 
 const mergeMetadata = () => {
   for (let key in metadata.value) {
+    console.log("key")
+    console.log(key)
     if (key in form) {
       let castKey = key as (keyof typeof metadata.value & keyof typeof form);
       (form[castKey] as any) = metadata.value[castKey];
@@ -400,6 +404,12 @@ const mergeMetadata = () => {
   if (metadata.value?.publishedDate && StringUtils.isNotBlank(metadata.value?.publishedDate)) {
     publishedDate.value = new Date(metadata.value?.publishedDate)
   }
+  if (metadata.value?.series != null && metadata.value?.series?.length > 0) {
+    seriesCopy.value.push({
+      "name": metadata.value?.series,
+      "numberInSeries" : metadata.value.numberInSeries
+    })
+  }
 }
 
 const isbn10ValidationMessage = ref("")
@@ -452,10 +462,10 @@ let displayDatepicker = computed(() => {
 
 <template>
   <section>
-    <div class="grid columns is-multiline is-centered">
-      <div class="grid sm:grid-cols-3 mb-4 sm:w-10/12 justify-center justify-items-center justify-self-center column is-centered is-offset-one-fifth is-three-fifths">
+    <div class="grid columns is-multiline">
+      <div class="grid sm:grid-cols-3 mb-4 sm:w-10/12 justify-center justify-items-center justify-self-center column is-offset-one-fifth is-three-fifths">
         <div />
-        <h1 class="text-2xl title has-text-weight-normal typewriter capitalize">
+        <h1 class="text-2xl typewriter capitalize">
           {{ t('nav.add_book') }}
         </h1>
         <div class="flex">
@@ -486,7 +496,7 @@ let displayDatepicker = computed(() => {
           </svg>
         </div>
       </div>
-      <div class="form-control sm:w-8/12 justify-center justify-items-center justify-self-center column is-two-thirds">
+      <div class="form-control sm:w-8/12 justify-self-center column is-two-thirds">
         <div class="field mb-3">
           <o-field
             horizontal
@@ -510,7 +520,7 @@ let displayDatepicker = computed(() => {
               v-model="authors"
               :data="filteredAuthors"
               :allow-autocomplete="true"
-              :autocomplete="true"
+              autocomplete="off"
               :allow-new="true"
               :allow-duplicates="false"
               :open-on-focus="true"
@@ -534,7 +544,7 @@ let displayDatepicker = computed(() => {
               v-model="tags"
               :data="filteredTags"
               :allow-autocomplete="true"
-              :autocomplete="true"
+              autocomplete="off"
               :allow-new="true"
               :allow-duplicates="false"
               :open-on-focus="true"
@@ -558,7 +568,7 @@ let displayDatepicker = computed(() => {
               v-model="translators"
               :data="filteredTranslators"
               :allow-autocomplete="true"
-              :autocomplete="true"
+              autocomplete="off"
               :allow-new="true"
               :allow-duplicates="false"
               :open-on-focus="true"
@@ -714,21 +724,45 @@ let displayDatepicker = computed(() => {
         </div>
         <div class="field mb-3">
           <o-field
-            horizontal
             :label="t('book.series')"
+            horizontal
             class="capitalize"
           >
-            <o-input
-              v-model="form.series"
-              class="input focus:input-accent"
-            />
-            <o-input
-              v-model="form.numberInSeries"
-              type="number"
-              min="0"
-              step="0.1"
-              class="input focus:input-accent"
-            />
+            <div
+              v-for="seriesItem,idx in seriesCopy"
+              :key="seriesItem.seriesId"
+              class="flex flex-col sm:flex-row items-center grow w-full pb-2"
+            >
+              <SeriesInput
+                :series="seriesItem"
+                :parent-series="seriesCopy"
+                @update-series="(series: SeriesOrder) => seriesCopy[idx] = series"
+              />
+              <button
+                class="btn btn-error btn-outline sm:btn-sm px-1 sm:border-none"
+                @click="seriesCopy.splice(idx, 1)"
+              >
+                <span class="icon">
+                  <i class="mdi mdi-delete mdi-18px" />
+                </span>
+              </button>
+            </div>
+          </o-field>
+        </div>
+        <div class="field mb-3">
+          <o-field
+            label=""
+            horizontal
+            class="capitalize"
+          >
+            <button
+              class="btn btn-primary btn-circle p-2 btn-sm"
+              @click="seriesCopy.push({'name' : ''})"
+            >
+              <span class="icon">
+                <i class="mdi mdi-plus mdi-18px" />
+              </span>
+            </button>
           </o-field>
         </div>
         <div class="block">
diff --git a/src/jelu-ui/src/components/AdminAuthors.vue b/src/jelu-ui/src/components/AdminAuthors.vue
index 229d62b1..5d6ca160 100644
--- a/src/jelu-ui/src/components/AdminAuthors.vue
+++ b/src/jelu-ui/src/components/AdminAuthors.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
 import { useProgrammatic } from "@oruga-ui/oruga-next"
 import { useTitle } from '@vueuse/core'
-import { computed, onMounted, Ref, ref } from 'vue'
+import { computed, Ref, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
 import { Author } from "../model/Author"
 import dataService from "../services/DataService"
-import { key } from '../store'
 import { StringUtils } from "../utils/StringUtils"
 import dayjs from "dayjs";
 import useDates from '../composables/dates'
@@ -20,7 +18,6 @@ const { t, locale, availableLocales } = useI18n({
       useScope: 'global'
     })
 
-const store = useStore(key)
 const router = useRouter()
 const { oruga } = useProgrammatic();
 
@@ -179,7 +176,6 @@ const rightDoD = computed(() => {
         </o-field>
       </div>
     </div>
-    <!-- <div class=""> -->
     <div class="justify-self-center col-span-2 sm:col-span-1 w-11/12 sm:w-8/12">
       <div class="field">
         <o-field
diff --git a/src/jelu-ui/src/components/AdminBase.vue b/src/jelu-ui/src/components/AdminBase.vue
index 8ac3d4ed..86d914bb 100644
--- a/src/jelu-ui/src/components/AdminBase.vue
+++ b/src/jelu-ui/src/components/AdminBase.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useTitle } from '@vueuse/core'
-import { onMounted, ref } from 'vue'
+import { ref } from 'vue'
 import { useStore } from 'vuex'
 import { key } from '../store'
 import { useI18n } from 'vue-i18n'
diff --git a/src/jelu-ui/src/components/AdminUsers.vue b/src/jelu-ui/src/components/AdminUsers.vue
index 65dba24d..15e8661d 100644
--- a/src/jelu-ui/src/components/AdminUsers.vue
+++ b/src/jelu-ui/src/components/AdminUsers.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
+import { setErrors } from '@formkit/vue'
+import { useProgrammatic } from "@oruga-ui/oruga-next"
 import { useTitle } from '@vueuse/core'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useStore } from 'vuex'
 import dataService from "../services/DataService"
-import { key } from '../store'
- import { setErrors } from '@formkit/vue'
- import { ObjectUtils } from "../utils/ObjectUtils";
- import { useProgrammatic } from "@oruga-ui/oruga-next";
+import { ObjectUtils } from "../utils/ObjectUtils"
 
 const { t } = useI18n({
   inheritLocale: true,
@@ -16,7 +14,6 @@ const { t } = useI18n({
 
 useTitle('Jelu | Users admin')
 
-const store = useStore(key)
 const { oruga } = useProgrammatic()
 
 const form = ref({'login' : '', 'password' : '', 'admin': false})
diff --git a/src/jelu-ui/src/components/AuthorBooks.vue b/src/jelu-ui/src/components/AuthorBooks.vue
index 80086166..16f53484 100644
--- a/src/jelu-ui/src/components/AuthorBooks.vue
+++ b/src/jelu-ui/src/components/AuthorBooks.vue
@@ -221,7 +221,7 @@ getBooks()
     <div class="grid items-center justify-center justify-items-center justify-self-center sm:grid-cols-3 mb-4 sm:w-10/12 column is-full">
       <div />
       <div class="level-item">
-        <h2 class="text-2xl inline mr-2 title has-text-weight-normal typewriter">
+        <h2 class="text-2xl inline mr-2 typewriter">
           {{ author.name }}
         </h2>
         <button
diff --git a/src/jelu-ui/src/components/AutoImportFormModal.vue b/src/jelu-ui/src/components/AutoImportFormModal.vue
index 00c2baf4..f66ac467 100644
--- a/src/jelu-ui/src/components/AutoImportFormModal.vue
+++ b/src/jelu-ui/src/components/AutoImportFormModal.vue
@@ -130,7 +130,7 @@ function pluginsModalClosed() {
   <section class="edit-modal">
     <div class="grid justify-center justify-items-center columns is-centered is-multiline">
       <div class="mb-2">
-        <h1 class="text-2xl title has-text-weight-normal typewriter capitalize">
+        <h1 class="text-2xl typewriter capitalize">
           {{ t('labels.import_book') }}
         </h1>
       </div>
diff --git a/src/jelu-ui/src/components/BookCard.vue b/src/jelu-ui/src/components/BookCard.vue
index e879b440..2a65f35d 100644
--- a/src/jelu-ui/src/components/BookCard.vue
+++ b/src/jelu-ui/src/components/BookCard.vue
@@ -111,7 +111,6 @@ const toggleEdit = (book: UserBook) => {
 
 watch(checked, (newVal, oldVal) => {
   console.log(props.book.id + " " + checked.value)
-  // console.log(newVal + " " + oldVal)
   emit("update:checked", props.book.id != null ? props.book.id : null , checked.value)
 })
 
@@ -225,11 +224,11 @@ watch(checked, (newVal, oldVal) => {
         >{{ eventText }}</span>
         <div class="flex">
           <span
-            v-if="book.book.numberInSeries"
-            v-tooltip="book.book.series"
+            v-if="book.book.series && book.book.series.length > 0"
+            v-tooltip="book.book.series[0].name"
             class="badge is-family-sans-serif mx-1"
           >
-            #{{ book.book.numberInSeries }}
+            #{{ book.book.series[0].numberInSeries }}
           </span>
           <span
             v-if="book.owned"
diff --git a/src/jelu-ui/src/components/BookDataCard.vue b/src/jelu-ui/src/components/BookDataCard.vue
index 3aa36fe3..d487947f 100644
--- a/src/jelu-ui/src/components/BookDataCard.vue
+++ b/src/jelu-ui/src/components/BookDataCard.vue
@@ -188,27 +188,34 @@ function modalClosed() {
           <span class="font-semibold capitalize">{{ t('book.published_date') }} :</span>
           {{ formatDateString(props.book.publishedDate) }}
         </p>
-        <div v-if="props.book.series">
+        <div v-if="props.book.series && props.book.series.length > 0">
           <span class="font-semibold capitalize">{{ t('book.series') }} :&nbsp;</span>
-          <router-link
-            v-if="links != null && links === true"
-            class="link hover:underline hover:decoration-4 hover:decoration-secondary"
-            :to="{ name: 'series', query: { series: props.book.series } }"
-          >
-            {{ props.book.series }}&nbsp;
-            <span
-              v-if="props.book.numberInSeries"
-            >-&nbsp;{{ props.book.numberInSeries }}</span>
-          </router-link>
-          <div
-            v-else
-            class="inline-block"
-          >
-            <span>{{ props.book.series }}&nbsp;</span>
-            <span
-              v-if="props.book.numberInSeries"
-            >-&nbsp;{{ props.book.numberInSeries }}</span>
-          </div>
+          <ul>
+            <li
+              v-for="seriesItem in props.book.series"
+              :key="seriesItem.seriesId"
+            >
+              <router-link
+                v-if="links != null && links === true"
+                class="link hover:underline hover:decoration-4 hover:decoration-secondary"
+                :to="{ name: 'series', params: { seriesId: seriesItem.seriesId } }"
+              >
+                {{ seriesItem.name }}&nbsp;
+                <span
+                  v-if="seriesItem.numberInSeries"
+                >-&nbsp;{{ seriesItem.numberInSeries }}</span>
+              </router-link>
+              <div
+                v-else
+                class="inline-block"
+              >
+                <span>{{ seriesItem.name }}&nbsp;</span>
+                <span
+                  v-if="seriesItem.numberInSeries"
+                >-&nbsp;{{ seriesItem.numberInSeries }}</span>
+              </div>
+            </li>
+          </ul>
         </div>
         <p v-if="props.book.language">
           <span class="font-semibold capitalize">{{ t('book.language') }} :</span>
diff --git a/src/jelu-ui/src/components/BookDetail.vue b/src/jelu-ui/src/components/BookDetail.vue
index 34696646..8b7a7036 100644
--- a/src/jelu-ui/src/components/BookDetail.vue
+++ b/src/jelu-ui/src/components/BookDetail.vue
@@ -1,29 +1,26 @@
 <script setup lang="ts">
+import { useProgrammatic } from "@oruga-ui/oruga-next"
+import { until, useClipboard, usePermission, useTitle } from '@vueuse/core'
+import dayjs from 'dayjs'
 import { computed, ComputedRef, Ref, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
-import { Book, UserBook } from '../model/Book'
 import { useStore } from 'vuex'
-import { key } from '../store'
+import useDates from '../composables/dates'
+import { Book, UserBook } from '../model/Book'
+import { Metadata } from "../model/Metadata"
+import { CreateReadingEvent, ReadingEvent, ReadingEventType } from '../model/ReadingEvent'
+import { Review } from '../model/Review'
+import { User } from '../model/User'
 import dataService from "../services/DataService"
+import { key } from '../store'
 import { ObjectUtils } from '../utils/ObjectUtils'
+import AutoImportFormModalVue from "./AutoImportFormModal.vue"
 import EditBookModal from "./EditBookModal.vue"
+import MergeBookModal from './MergeBookModal.vue'
 import ReadingEventModalVue from './ReadingEventModal.vue'
+import ReviewCard from "./ReviewCard.vue"
 import ReviewModalVue from './ReviewModal.vue'
-import { useProgrammatic } from "@oruga-ui/oruga-next";
-import dayjs from 'dayjs'
-import { CreateReadingEvent, ReadingEvent, ReadingEventType } from '../model/ReadingEvent'
-import { useTitle } from '@vueuse/core'
-import useDates from '../composables/dates'
-import { useI18n } from 'vue-i18n'
-import { useClipboard } from '@vueuse/core'
-import { usePermission } from '@vueuse/core'
-import { Review } from '../model/Review'
-import { until } from '@vueuse/core'
-import { User } from '../model/User'
-import ReviewCard from "./ReviewCard.vue";
-import AutoImportFormModalVue from "./AutoImportFormModal.vue";
-import { Metadata } from "../model/Metadata";
-import MergeBookModal from './MergeBookModal.vue'
 
 const { t, d } = useI18n({
       inheritLocale: true,
@@ -574,17 +571,24 @@ getBook()
           <span class="font-semibold capitalize">{{ t('book.published_date') }} :</span>
           {{ formatDateString(book.book.publishedDate) }}
         </p>
-        <p v-if="book?.book?.series">
+        <p v-if="book?.book?.series && book?.book?.series != null && book?.book?.series.length > 0">
           <span class="font-semibold capitalize">{{ t('book.series') }} :&nbsp;</span>
-          <router-link
-            class="link hover:underline hover:decoration-4 hover:decoration-secondary"
-            :to="{ name: 'series', query: { series: book?.book.series } }"
-          >
-            {{ book.book.series }}&nbsp;
-            <span
-              v-if="book?.book?.numberInSeries"
-            >-&nbsp;{{ book.book.numberInSeries }}</span>
-          </router-link>
+          <ul>
+            <li
+              v-for="seriesItem in book?.book?.series"
+              :key="seriesItem.seriesId"
+            >
+              <router-link
+                class="link hover:underline hover:decoration-4 hover:decoration-secondary"
+                :to="{ name: 'series', params: { seriesId: seriesItem.seriesId } }"
+              >
+                {{ seriesItem.name }}&nbsp;
+                <span
+                  v-if="seriesItem.numberInSeries"
+                >-&nbsp;{{ seriesItem.numberInSeries }}</span>
+              </router-link>
+            </li>
+          </ul>
         </p>
         <p v-if="book?.book?.language">
           <span class="font-semibold capitalize">{{ t('book.language') }} :</span>
diff --git a/src/jelu-ui/src/components/BookList.vue b/src/jelu-ui/src/components/BookList.vue
index 22b640cb..2ccdb05a 100644
--- a/src/jelu-ui/src/components/BookList.vue
+++ b/src/jelu-ui/src/components/BookList.vue
@@ -1,17 +1,16 @@
 <script setup lang="ts">
-import { computed, onMounted, Ref, ref, watch } from "vue";
+import { useThrottleFn, useTitle } from '@vueuse/core';
 import { useRouteQuery } from '@vueuse/router';
-import dataService from "../services/DataService";
-import { UserBook } from "../model/Book";
-import BookCard from "./BookCard.vue";
-import usePagination from '../composables/pagination';
-import { ReadingEventType } from "../model/ReadingEvent";
+import { computed, onMounted, Ref, ref, watch } from "vue";
+import { useI18n } from 'vue-i18n';
 import useBulkEdition from '../composables/bulkEdition';
-import { useThrottleFn } from '@vueuse/core'
+import usePagination from '../composables/pagination';
 import useSort from "../composables/sort";
+import { UserBook } from "../model/Book";
+import { ReadingEventType } from "../model/ReadingEvent";
+import dataService from "../services/DataService";
+import BookCard from "./BookCard.vue";
 import SortFilterBarVue from "./SortFilterBar.vue";
-import { useTitle } from '@vueuse/core'
-import { useI18n } from 'vue-i18n'
 
 useTitle('Jelu | My books')
 
@@ -394,7 +393,7 @@ try {
     />
   </div>
   <div v-else>
-    <h2 class="title has-text-weight-normal typewriter capitalize">
+    <h2 class="text-3xl typewriter capitalize">
       {{ t('labels.library_empty') }}
     </h2>
     <span class="icon is-large">
diff --git a/src/jelu-ui/src/components/BookReviews.vue b/src/jelu-ui/src/components/BookReviews.vue
index 27bc8d6c..99d99c27 100644
--- a/src/jelu-ui/src/components/BookReviews.vue
+++ b/src/jelu-ui/src/components/BookReviews.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { useTitle } from '@vueuse/core';
 import { Ref, ref, watch } from "vue";
-import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { Book } from "../model/Book";
 import { Review } from "../model/Review";
@@ -11,11 +10,6 @@ import ReviewCard from "./ReviewCard.vue";
 
 const route = useRoute()
 
-const { t } = useI18n({
-  inheritLocale: true,
-  useScope: 'global'
-})
-
 useTitle('Jelu | Reviews')
 const reviews: Ref<Array<Review>> = ref([])
 const book: Ref<Book> = ref({title:""})
diff --git a/src/jelu-ui/src/components/BulkEditModal.vue b/src/jelu-ui/src/components/BulkEditModal.vue
index c6f4733b..121d6187 100644
--- a/src/jelu-ui/src/components/BulkEditModal.vue
+++ b/src/jelu-ui/src/components/BulkEditModal.vue
@@ -63,10 +63,6 @@ watch(toRead, (newVal, oldVal) => {
   console.log("toRead " + toRead.value)
 })
 
-// watch(add, (newVal, oldVal) => {
-//   console.log("add " + add.value)
-// })
-
 const addTags: Ref<Array<Tag>> = ref([])
 const removeTags: Ref<Array<Tag>> = ref([])
 
diff --git a/src/jelu-ui/src/components/EditAuthorModal.vue b/src/jelu-ui/src/components/EditAuthorModal.vue
index 6b0cca90..f58affda 100644
--- a/src/jelu-ui/src/components/EditAuthorModal.vue
+++ b/src/jelu-ui/src/components/EditAuthorModal.vue
@@ -88,13 +88,6 @@ const search = () => {
   })
 }
 
-const toHtmlLink = (link: string) => {
-  if (link != null) {
-    return `<a href="${link}" target="_blank">${link}</a>`
-  }
-  return ''
-}
-
 const fillFormWithEntry = (entry: WikipediaSearchResultElement) => {
   progress.value = true
   dataService.wikipediaPage(entry.title, searchlanguage.value)
diff --git a/src/jelu-ui/src/components/EditBookModal.vue b/src/jelu-ui/src/components/EditBookModal.vue
index 7be06067..6b227d89 100644
--- a/src/jelu-ui/src/components/EditBookModal.vue
+++ b/src/jelu-ui/src/components/EditBookModal.vue
@@ -10,6 +10,8 @@ import { StringUtils } from "../utils/StringUtils";
 import { useProgrammatic } from "@oruga-ui/oruga-next";
 import { Tag } from "../model/Tag";
 import { useI18n } from 'vue-i18n'
+import { SeriesOrder } from "../model/Series";
+import SeriesInput from "./SeriesInput.vue";
 
 const { t } = useI18n({
       inheritLocale: true,
@@ -82,7 +84,10 @@ const toReadDisplay = computed(() => {
   return ""
 })
 
+const seriesCopy: Array<SeriesOrder> = userbook.value.book.series ?? []
+
 const importBook = () => {
+  userbook.value.book.series = seriesCopy.filter(s => s.name != null && s.name.trim().length > 0)
   console.log("import")
   console.log(userbook)
   if (!props.canAddEvent || userbook.value.lastReadingEvent === ReadingEventType.NONE) {
@@ -279,7 +284,7 @@ function toggleRemoveImage() {
               v-model="userbook.book.authors"
               :data="filteredAuthors"
               :allow-autocomplete="true"
-              :autocomplete="true"
+              autocomplete="off"
               :allow-new="true"
               :allow-duplicates="false"
               :open-on-focus="true"
@@ -304,7 +309,7 @@ function toggleRemoveImage() {
               v-model="userbook.book.tags"
               :data="filteredTags"
               :allow-autocomplete="true"
-              :autocomplete="true"
+              autocomplete="off"
               :allow-new="true"
               :allow-duplicates="false"
               :open-on-focus="true"
@@ -328,7 +333,7 @@ function toggleRemoveImage() {
               v-model="userbook.book.translators"
               :data="filteredTranslators"
               :allow-autocomplete="true"
-              :autocomplete="true"
+              autocomplete="off"
               :allow-new="true"
               :allow-duplicates="false"
               :open-on-focus="true"
@@ -436,7 +441,7 @@ function toggleRemoveImage() {
               :placeholder="t('labels.click_to_select')"
               icon="calendar"
               icon-right="close"
-              icon-right-clickable="true"
+              :icon-right-clickable="true"
               trap-focus
               class="input focus:input-accent"
               @icon-right-click="clearDatePicker"
@@ -469,23 +474,49 @@ function toggleRemoveImage() {
             />
           </o-field>
         </div>
-        <div class="field">
+        <div class="field pb-2">
           <o-field
-            horizontal
             :label="t('book.series')"
+            horizontal
             class="capitalize"
           >
-            <o-input 
-              v-model="userbook.book.series" 
-              class="input focus:input-accent"
-            />
-            <o-input
-              v-model="userbook.book.numberInSeries"
-              type="number"
-              min="0"
-              step="0.1"
-              class="input focus:input-accent"
-            />
+            <div class="flex flex-col grow w-full">
+              <div
+                v-for="seriesItem,idx in seriesCopy"
+                :key="seriesItem.seriesId"
+                class="flex items-center grow w-full pb-2"
+              >
+                <SeriesInput
+                  :series="seriesItem"
+                  :parent-series="seriesCopy"
+                  @update-series="(series: SeriesOrder) => seriesCopy[idx] = series"
+                />
+                <button
+                  class="btn btn-error btn-outline sm:btn-sm px-1 sm:border-none"
+                  @click="seriesCopy.splice(idx, 1)"
+                >
+                  <span class="icon">
+                    <i class="mdi mdi-delete mdi-18px" />
+                  </span>
+                </button>
+              </div>
+            </div>
+          </o-field>
+        </div>
+        <div class="field pb-2">
+          <o-field
+            label=""
+            horizontal
+            class="capitalize"
+          >
+            <button
+              class="btn btn-primary btn-circle p-2 btn-sm"
+              @click="seriesCopy.push({'name' : ''})"
+            >
+              <span class="icon">
+                <i class="mdi mdi-plus mdi-18px" />
+              </span>
+            </button>
           </o-field>
         </div>
         <div
diff --git a/src/jelu-ui/src/components/History.vue b/src/jelu-ui/src/components/History.vue
index 3e1bd946..1eedeff2 100644
--- a/src/jelu-ui/src/components/History.vue
+++ b/src/jelu-ui/src/components/History.vue
@@ -200,5 +200,4 @@ getYears()
 
 <style scoped>
 
-
 </style>
diff --git a/src/jelu-ui/src/components/Imports.vue b/src/jelu-ui/src/components/Imports.vue
index be3e25fa..097fb95d 100644
--- a/src/jelu-ui/src/components/Imports.vue
+++ b/src/jelu-ui/src/components/Imports.vue
@@ -86,7 +86,6 @@ watch(file, (newVal, oldVal) => {
   console.log(oldVal)
 })
 
-
 </script>
 
 <template>
@@ -250,5 +249,4 @@ watch(file, (newVal, oldVal) => {
 
 <style scoped>
 
-
 </style>
diff --git a/src/jelu-ui/src/components/MergeBookModal.vue b/src/jelu-ui/src/components/MergeBookModal.vue
index 8ac776c1..475ca9d0 100644
--- a/src/jelu-ui/src/components/MergeBookModal.vue
+++ b/src/jelu-ui/src/components/MergeBookModal.vue
@@ -7,6 +7,8 @@ import { Metadata } from "../model/Metadata";
 import { Tag } from "../model/Tag";
 import dataService from "../services/DataService";
 import { ObjectUtils } from "../utils/ObjectUtils";
+import { SeriesOrder } from "../model/Series";
+import SeriesInput from "./SeriesInput.vue";
 
 const { t } = useI18n({
   inheritLocale: true,
@@ -21,6 +23,7 @@ const props = defineProps<{
 const book: Ref<Book> = ref(props.book)
 const initialIsbn10: Ref<string|undefined> = ref(book.value.isbn10)
 const initialIsbn13: Ref<string|undefined> = ref(book.value.isbn13)
+const seriesCopy: Array<SeriesOrder> = book.value.series ?? []
 
 const emit = defineEmits<{
   (e: 'close'): void
@@ -72,6 +75,16 @@ const importData = async () => {
       progress.value = false
       return
     }
+    if (seriesCopy.length > 0) {
+      if (book.value.series == null) {
+        book.value.series = []
+      }
+      seriesCopy.forEach(s => {
+        if (s.name.trim().length > 0){
+          book.value.series?.push(s)
+        }
+      })
+    }
     dataService.updateBook(book.value.id, {...book.value})
     .then(res => {
           progress.value = false
@@ -468,76 +481,42 @@ const listAsString = (list: Array<Author|Tag>|undefined) => {
           <label class="label">
             <span class="label-text">{{ t('book.series') }}</span>
           </label>
-          <input
-            v-model="book.series"
-            type="text"
-            class="input input-bordered input-primary w-full max-w-xs"
+          <div
+            v-for="seriesItem,idx in seriesCopy"
+            :key="seriesItem.seriesId"
+            class="flex flex-col sm:flex-row items-center grow w-full pb-2"
           >
-        </div>
-        <div class="form-control w-full max-w-xs">
-          <div class="join">
-            <button 
-              class="btn btn-square btn-ghost btn-outline btn-secondary join-item z-0"
-              @click="book.series = props.metadata.series"
+            <SeriesInput
+              class="jl-formkit"
+              :series="seriesItem"
+              :parent-series="seriesCopy"
+              @update-series="(series: SeriesOrder) => seriesCopy[idx] = series"
+            />
+            <button
+              class="btn btn-error btn-outline sm:btn-sm px-1 sm:border-none"
+              @click="seriesCopy.splice(idx, 1)"
             >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                fill="currentColor"
-                class="w-6 h-6"
-              >
-                <path
-                  fill-rule="evenodd"
-                  d="M11.03 3.97a.75.75 0 010 1.06l-6.22 6.22H21a.75.75 0 010 1.5H4.81l6.22 6.22a.75.75 0 11-1.06 1.06l-7.5-7.5a.75.75 0 010-1.06l7.5-7.5a.75.75 0 011.06 0z"
-                  clip-rule="evenodd"
-                />
-              </svg>
+              <span class="icon">
+                <i class="mdi mdi-delete mdi-18px" />
+              </span>
             </button>
-            <input
-              type="text"
-              :value="props.metadata.series"
-              disabled
-              class="jelu-cursor-text input input-bordered input-secondary w-full max-w-xs join-item"
+          </div>
+          <div class="field pb-2">
+            <button
+              class="btn btn-primary btn-circle p-2 btn-sm"
+              @click="seriesCopy.push({'name' : ''})"
             >
+              <span class="icon">
+                <i class="mdi mdi-plus mdi-18px" />
+              </span>
+            </button>
           </div>
         </div>
         <div class="form-control w-full max-w-xs">
-          <label class="label">
-            <span class="label-text">{{ t('book.nb_in_series') }}</span>
-          </label>
-          <input
-            v-model="book.numberInSeries"
-            type="number"
-            min="0"
-            step="0.1"
-            class="input input-bordered input-primary w-full max-w-xs"
-          >
-        </div>
-        <div class="form-control w-full max-w-xs">
-          <div class="join">
-            <button 
-              class="btn btn-square btn-ghost btn-outline btn-secondary join-item z-0"
-              @click="book.numberInSeries = props.metadata.numberInSeries"
-            >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                fill="currentColor"
-                class="w-6 h-6"
-              >
-                <path
-                  fill-rule="evenodd"
-                  d="M11.03 3.97a.75.75 0 010 1.06l-6.22 6.22H21a.75.75 0 010 1.5H4.81l6.22 6.22a.75.75 0 11-1.06 1.06l-7.5-7.5a.75.75 0 010-1.06l7.5-7.5a.75.75 0 011.06 0z"
-                  clip-rule="evenodd"
-                />
-              </svg>
-            </button>
-            <input
-              type="text"
-              :value="props.metadata.numberInSeries"
-              disabled
-              class="jelu-cursor-text input input-bordered input-secondary w-full max-w-xs join-item"
-            >
+          <div class="flex">
+            <div class="m-2">
+              {{ props.metadata.series }} <span v-if="props.metadata.numberInSeries">#{{ props.metadata.numberInSeries }}</span>
+            </div>
           </div>
         </div>
         <div class="form-control w-full max-w-xs">
diff --git a/src/jelu-ui/src/components/QuotesDisplay.vue b/src/jelu-ui/src/components/QuotesDisplay.vue
index 1142d614..43e25f93 100644
--- a/src/jelu-ui/src/components/QuotesDisplay.vue
+++ b/src/jelu-ui/src/components/QuotesDisplay.vue
@@ -30,14 +30,12 @@ onMounted(() => {
 
 });
 
-// if (isLogged.value) {
 try {
   getQuotes()
 }
 catch (err) {
   console.log("failed get quotes : " + err);
 }
-// }
 
 </script>
 
diff --git a/src/jelu-ui/src/components/ReviewDetail.vue b/src/jelu-ui/src/components/ReviewDetail.vue
index f148849c..8c9d4e9d 100644
--- a/src/jelu-ui/src/components/ReviewDetail.vue
+++ b/src/jelu-ui/src/components/ReviewDetail.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { useTitle } from '@vueuse/core';
 import { Ref, ref, watch } from "vue";
-import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { Book } from "../model/Book";
 import { Review } from "../model/Review";
@@ -11,11 +10,6 @@ import ReviewCard from "./ReviewCard.vue";
 
 const route = useRoute()
 
-const { t } = useI18n({
-  inheritLocale: true,
-  useScope: 'global'
-})
-
 const review: Ref<Review|null> = ref(null)
 const book: Ref<Book|null> = ref(null)
 
diff --git a/src/jelu-ui/src/components/ScanModal.vue b/src/jelu-ui/src/components/ScanModal.vue
index a5d497c7..35ec0fa8 100644
--- a/src/jelu-ui/src/components/ScanModal.vue
+++ b/src/jelu-ui/src/components/ScanModal.vue
@@ -35,7 +35,7 @@ const onDecode = (text: string) => {
   <section class="edit-modal">
     <div class="grid justify-center justify-items-center columns is-centered is-multiline">
       <div class="mb-2">
-        <h1 class="text-2xl title has-text-weight-normal typewriter capitalize">
+        <h1 class="text-2xl typewriter capitalize">
           {{ t('labels.import_book') }}
         </h1>
       </div>
diff --git a/src/jelu-ui/src/components/SearchResultsDisplay.vue b/src/jelu-ui/src/components/SearchResultsDisplay.vue
index f9f14b2c..478a8510 100644
--- a/src/jelu-ui/src/components/SearchResultsDisplay.vue
+++ b/src/jelu-ui/src/components/SearchResultsDisplay.vue
@@ -282,5 +282,4 @@ label {
   margin-left: -8px;
 }
 
-
 </style>
diff --git a/src/jelu-ui/src/components/SeriesBooks.vue b/src/jelu-ui/src/components/SeriesBooks.vue
index bd991fd4..fe6790aa 100644
--- a/src/jelu-ui/src/components/SeriesBooks.vue
+++ b/src/jelu-ui/src/components/SeriesBooks.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import { useThrottleFn } from '@vueuse/core';
+import { useThrottleFn, useTitle } from '@vueuse/core';
 import { useRouteQuery } from "@vueuse/router";
 import { computed, Ref, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 import useBulkEdition from '../composables/bulkEdition';
 import usePagination from '../composables/pagination';
 import useSort from "../composables/sort";
@@ -12,38 +13,58 @@ import dataService from "../services/DataService";
 import { ObjectUtils } from '../utils/ObjectUtils';
 import BookCard from "./BookCard.vue";
 import SortFilterBarVue from "./SortFilterBar.vue";
+import { Series } from '../model/Series';
 
 const { t } = useI18n({
       inheritLocale: true,
       useScope: 'global'
     })
 
+const route = useRoute()
+
 const { total, page, pageAsNumber, perPage, updatePage, getPageIsLoading, updatePageLoading } = usePagination()
 
 const { sortQuery, sortOrder, sortBy, sortOrderUpdated } = useSort('numberInSeries,asc')
 
-const series: Ref<string> = useRouteQuery('series') as Ref<string>
+const libraryFilter: Ref<LibraryFilter> = useRouteQuery('libraryFilter', 'ANY' as LibraryFilter)
 
 const { showSelect, selectAll, checkedCards, cardChecked, toggleEdit } = useBulkEdition(modalClosed)
 
 const open = ref(false)
 
+const series: Ref<Series> = ref({name: ""})
 const books: Ref<Array<Book>> = ref([]);
 
 const getBooksIsLoading: Ref<boolean> = ref(false)
 
-watch([() => series.value, page, sortQuery], (newVal, oldVal) => {
+watch([() => route.params.seriesId, page, sortQuery, libraryFilter], (newVal, oldVal) => {
   console.log(newVal + " " + oldVal)
-  if (newVal !== oldVal && series.value !== undefined) {
+  if (newVal !== oldVal && route.params.seriesId !== undefined) {
     throttledGetBooks()
   }
 })
 
+watch(() => route.params.seriesId, (newVal, oldVal) => {
+  console.log(newVal + " " + oldVal)
+  if (newVal !== oldVal && route.params.seriesId !== undefined) {
+    getSeries()
+  }
+})
+
+const getSeries = async () => {
+  try {
+    series.value = await dataService.getSeriesById(route.params.seriesId as string)
+    useTitle('Jelu | ' + series.value.name)
+  } catch (error) {
+    console.log("failed get series : " + error);
+  }
+};
+
 const getBooks = () => {
     getBooksIsLoading.value = true
-    dataService.findBooks(
-      `series:"${series.value}"`,
-      pageAsNumber.value - 1, perPage.value, sortQuery.value, LibraryFilter.ONLY_USER_BOOKS)
+    dataService.getSeriesBooksById(route.params.seriesId as string, 
+      pageAsNumber.value - 1, perPage.value, sortQuery.value, 
+      libraryFilter.value)
       .then(res => {
         console.log(res)
             total.value = res.totalElements
@@ -75,6 +96,7 @@ function modalClosed() {
   throttledGetBooks()
 }
 
+getSeries()
 getBooks()
 
 </script>
@@ -126,6 +148,29 @@ getBooks()
         </o-radio>
       </div>
     </template>
+    <template #filters>
+      <div class="field">
+        <label class="label">{{ t('filtering.books_type') }} : </label>
+        <o-radio
+          v-model="libraryFilter"
+          native-value="ANY"
+        >
+          {{ t('filtering.any') }}
+        </o-radio>
+        <o-radio
+          v-model="libraryFilter"
+          native-value="ONLY_USER_BOOKS"
+        >
+          {{ t('filtering.only_in_my_list') }}
+        </o-radio>
+        <o-radio
+          v-model="libraryFilter"
+          native-value="ONLY_NON_USER_BOOKS"
+        >
+          {{ t('filtering.only_not_in_my_list') }}
+        </o-radio>
+      </div>
+    </template>
   </sort-filter-bar-vue>
   <div class="flex flex-row justify-between">
     <div class="flex flex-row gap-1 order-last sm:order-first">
@@ -172,7 +217,7 @@ getBooks()
       <span class="icon">
         <i class="mdi mdi-bookshelf" />
       </span>
-      {{ series }} :
+      {{ series.name }} :
     </h2>
     <div />
   </div>
diff --git a/src/jelu-ui/src/components/SeriesInput.vue b/src/jelu-ui/src/components/SeriesInput.vue
new file mode 100644
index 00000000..8b0b6ff3
--- /dev/null
+++ b/src/jelu-ui/src/components/SeriesInput.vue
@@ -0,0 +1,87 @@
+<script setup lang="ts">
+import { Ref, ref } from "vue";
+import { Series, SeriesOrder } from "../model/Series";
+import dataService from "../services/DataService";
+
+const props = defineProps<{ 
+    series: SeriesOrder,
+    parentSeries: Array<SeriesOrder> | undefined
+}>()
+
+const localData: Ref<SeriesOrder> = ref(
+    {
+        "name" : props.series.name, 
+        "numberInSeries": props.series.numberInSeries,
+        "seriesId" : props.series.seriesId
+    })
+
+const previousSelected: Ref<SeriesOrder> = ref(
+    {
+        "name" : props.series.name, 
+        "numberInSeries": props.series.numberInSeries,
+        "seriesId" : props.series.seriesId
+    })
+
+const emit = defineEmits<{
+  (e: 'update-series', series: SeriesOrder): void
+}>()
+
+let filteredSeries: Ref<Array<Series>> = ref([]);
+
+function getFilteredSeries(text: string) {
+  dataService.findSeriesByCriteria(text).then((data) => filteredSeries.value = data.content)
+}
+
+function onSelect(series: Series, event: UIEvent) {
+  console.log(series)
+  console.log(event)
+  // we receive from oruga weird events while nothing is selected
+  // so try to get rid of those null data we receive
+  if (series != null && event != null && series.id != null) {
+    console.log('update')
+    localData.value.name = series.name
+    localData.value.seriesId = series.id
+    previousSelected.value.name = series.name
+    previousSelected.value.seriesId = series.id
+  }
+}
+
+const isFetching = ref(false)
+const onUpdate = (inp: string) => {
+    console.log("inp")
+    console.log(inp)
+    if (localData.value.name !== previousSelected.value.name) {
+        localData.value.seriesId = ""
+    }
+    console.log('after')
+    console.log(localData.value)
+    emit('update-series', localData.value)
+}
+</script>
+
+<template>
+  <div class="flex flex-col sm:flex-row gap-1 grow w-full">
+    <o-autocomplete
+      v-model="localData.name"
+      :data="filteredSeries"
+      :clear-on-select="false"
+      field="name"
+      :loading="isFetching"
+      :debounce-typing="150"
+      @typing="getFilteredSeries"
+      @select="onSelect"
+      @update:model-value="onUpdate"
+    />
+    <o-input
+      v-model="localData.numberInSeries"
+      type="number"
+      min="0"
+      step="0.1"
+      class="input focus:input-accent"
+      @update:model-value="emit('update-series', localData)"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/jelu-ui/src/components/ToReadList.vue b/src/jelu-ui/src/components/ToReadList.vue
index 29ed6d35..0167e23a 100644
--- a/src/jelu-ui/src/components/ToReadList.vue
+++ b/src/jelu-ui/src/components/ToReadList.vue
@@ -333,5 +333,4 @@ label {
   margin-left: -8px;
 }
 
-
 </style>
diff --git a/src/jelu-ui/src/components/UserDetail.vue b/src/jelu-ui/src/components/UserDetail.vue
index a741b74f..7872c208 100644
--- a/src/jelu-ui/src/components/UserDetail.vue
+++ b/src/jelu-ui/src/components/UserDetail.vue
@@ -72,7 +72,6 @@ const getReadEvents = async () => {
   }
 };
 
-
 const getToRead = async () => {
   getToReadIsLoading.value = true
   try {
diff --git a/src/jelu-ui/src/components/UserMessages.vue b/src/jelu-ui/src/components/UserMessages.vue
index 2a46c7cf..17484081 100644
--- a/src/jelu-ui/src/components/UserMessages.vue
+++ b/src/jelu-ui/src/components/UserMessages.vue
@@ -196,5 +196,4 @@ onMounted(() => {
 
 <style scoped>
 
-
 </style>
diff --git a/src/jelu-ui/src/components/UserSettings.vue b/src/jelu-ui/src/components/UserSettings.vue
index e651de27..1841ec0c 100644
--- a/src/jelu-ui/src/components/UserSettings.vue
+++ b/src/jelu-ui/src/components/UserSettings.vue
@@ -1,15 +1,11 @@
 <script setup lang="ts">
-import { useTitle } from '@vueuse/core'
-import { inject, onMounted, watch } from 'vue'
-import { useStore } from 'vuex'
-import { key } from '../store'
+import { useLocalStorage, useTitle } from '@vueuse/core'
 import { themeChange } from 'theme-change'
+import { inject, onMounted, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useLocalStorage } from '@vueuse/core'
 
 useTitle('Jelu | User settings')
 
-const store = useStore(key)
 const { t, locale, availableLocales } = useI18n({
       inheritLocale: true,
       useScope: 'global'
diff --git a/src/jelu-ui/src/components/UserStats.vue b/src/jelu-ui/src/components/UserStats.vue
index 36fad02e..e84f5c45 100644
--- a/src/jelu-ui/src/components/UserStats.vue
+++ b/src/jelu-ui/src/components/UserStats.vue
@@ -203,5 +203,4 @@ getYears()
 
 <style scoped>
 
-
 </style>
diff --git a/src/jelu-ui/src/components/UsersList.vue b/src/jelu-ui/src/components/UsersList.vue
index aa40f010..f4ffef6b 100644
--- a/src/jelu-ui/src/components/UsersList.vue
+++ b/src/jelu-ui/src/components/UsersList.vue
@@ -1,14 +1,12 @@
 <script setup lang="ts">
 import { useTitle } from '@vueuse/core'
-import { inject, onMounted, watch, ref, Ref, computed } from 'vue'
-import { useStore } from 'vuex'
-import { key } from '../store'
-import { themeChange } from 'theme-change'
+import { Ref, computed, ref } from 'vue'
+import Avatar from 'vue-avatar-sdh'
 import { useI18n } from 'vue-i18n'
-import { useLocalStorage } from '@vueuse/core'
+import { useStore } from 'vuex'
 import { User } from '../model/User'
-import dataService from "../services/DataService";
-import Avatar from 'vue-avatar-sdh'
+import dataService from "../services/DataService"
+import { key } from '../store'
 
 useTitle('Jelu | Users')
 
diff --git a/src/jelu-ui/src/components/Welcome.vue b/src/jelu-ui/src/components/Welcome.vue
index d8f75ffb..81883af1 100644
--- a/src/jelu-ui/src/components/Welcome.vue
+++ b/src/jelu-ui/src/components/Welcome.vue
@@ -286,5 +286,4 @@ function toggleReadingEventModal(currentEvent: ReadingEvent, edit: boolean) {
 
 <style lang="scss" scoped>
 
-
 </style>
diff --git a/src/jelu-ui/src/model/Book.ts b/src/jelu-ui/src/model/Book.ts
index ca8e6750..513818da 100644
--- a/src/jelu-ui/src/model/Book.ts
+++ b/src/jelu-ui/src/model/Book.ts
@@ -1,5 +1,6 @@
 import {Author} from "./Author";
 import { ReadingEvent, ReadingEventType } from "./ReadingEvent";
+import { SeriesOrder } from "./Series";
 import { Tag } from "./Tag";
 
 export interface Book {
@@ -17,8 +18,7 @@ export interface Book {
     authors?: Array<Author>,
     translators?: Array<Author>,
     tags?: Array<Tag>,
-    series?: string, 
-    numberInSeries? : number|null,
+    series?: Array<SeriesOrder>, 
     googleId?: string,
     amazonId?: string,
     goodreadsId?: string,
diff --git a/src/jelu-ui/src/model/Series.ts b/src/jelu-ui/src/model/Series.ts
new file mode 100644
index 00000000..a835e47b
--- /dev/null
+++ b/src/jelu-ui/src/model/Series.ts
@@ -0,0 +1,11 @@
+export interface SeriesOrder {
+    seriesId?: string,
+    name: string,
+    numberInSeries? : number|null,
+}
+export interface Series {
+    id?: string,
+    creationDate?: string,
+    name: string,
+    modificationDate?: string,
+}
diff --git a/src/jelu-ui/src/router.ts b/src/jelu-ui/src/router.ts
index 8bfb5315..8f9bd699 100644
--- a/src/jelu-ui/src/router.ts
+++ b/src/jelu-ui/src/router.ts
@@ -94,7 +94,7 @@ const router = createRouter({
             beforeEnter: [isLogged],
         },
         {
-            path: '/series',
+            path: '/series/:seriesId',
             component: () => import(/* webpackChunkName: "recommend" */ './components/SeriesBooks.vue'),
             name: 'series',
             beforeEnter: [isLogged],
diff --git a/src/jelu-ui/src/services/DataService.ts b/src/jelu-ui/src/services/DataService.ts
index d9f62163..92811939 100644
--- a/src/jelu-ui/src/services/DataService.ts
+++ b/src/jelu-ui/src/services/DataService.ts
@@ -22,6 +22,7 @@ import { CreateReviewDto, Review, UpdateReviewDto, Visibility } from "../model/R
 import { Role } from "../model/Role";
 import { StringUtils } from "../utils/StringUtils";
 import { MetadataRequest } from "../model/MetadataRequest";
+import { Series } from "../model/Series";
 
 class DataService {
 
@@ -41,6 +42,8 @@ class DataService {
 
   private API_TAG = '/tags';
 
+  private API_SERIES = '/series';
+
   private API_LOGOUT = '/logout';
 
   private API_METADATA = '/metadata';
@@ -533,6 +536,26 @@ class DataService {
     }
   }
 
+  findSeriesByCriteria = async (query?: string | null) => {
+    try {
+      const response = await this.apiClient.get<Page<Series>>(`${this.API_SERIES}`, {
+        params: {
+          name: query
+        }
+      });
+      console.log("called series by criteria")
+      console.log(response)
+      return response.data;
+    }
+    catch (error) {
+      if (axios.isAxiosError(error) && error.response) {
+        console.log("error axios " + error.response.status + " " + error.response.data.error)
+      }
+      console.log("error series by criteria " + (error as AxiosError).code)
+      throw new Error("error get series by criteria " + error)
+    }
+  }
+
   getTagById = async (tagId: string) => {
     try {
       const response = await this.apiClient.get<Tag>(`${this.API_TAG}/${tagId}`);
@@ -549,6 +572,22 @@ class DataService {
     }
   }
 
+  getSeriesById = async (seriesId: string) => {
+    try {
+      const response = await this.apiClient.get<Series>(`${this.API_SERIES}/${seriesId}`);
+      console.log("called series by id")
+      console.log(response)
+      return response.data;
+    }
+    catch (error) {
+      if (axios.isAxiosError(error) && error.response) {
+        console.log("error axios " + error.response.status + " " + error.response.data.error)
+      }
+      console.log("error series by id " + (error as AxiosError).code)
+      throw new Error("error get series by id " + error)
+    }
+  }
+
   getAuthorById = async (authorId: string) => {
     try {
       const response = await this.apiClient.get<Author>(`${this.API_AUTHOR}/${authorId}`, {
@@ -605,6 +644,30 @@ class DataService {
     }
   }
 
+  getSeriesBooksById = async (seriesId: string,
+    page?: number, size?: number, sort?: string, libraryFilter?: LibraryFilter) => {
+    try {
+      const response = await this.apiClient.get<Page<Book>>(`${this.API_SERIES}/${seriesId}${this.API_BOOK}`, {
+        params: {
+          page: page,
+          size: size,
+          sort: sort,
+          libraryFilter: libraryFilter
+        }
+      });
+      console.log("called series books by id")
+      console.log(response)
+      return response.data;
+    }
+    catch (error) {
+      if (axios.isAxiosError(error) && error.response) {
+        console.log("error axios " + error.response.status + " " + error.response.data.error)
+      }
+      console.log("error series books by id " + (error as AxiosError).code)
+      throw new Error("error get series books by id " + error)
+    }
+  }
+
   getAuthorBooksById = async (authorId: string,
     page?: number, size?: number, sort?: string, libraryFilter?: LibraryFilter,
     roleFilter?: Role) => {
diff --git a/src/main/kotlin/io/github/bayang/jelu/controllers/BooksController.kt b/src/main/kotlin/io/github/bayang/jelu/controllers/BooksController.kt
index 970fb99d..877c8ae9 100644
--- a/src/main/kotlin/io/github/bayang/jelu/controllers/BooksController.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/controllers/BooksController.kt
@@ -11,6 +11,7 @@ import io.github.bayang.jelu.dto.CreateUserBookDto
 import io.github.bayang.jelu.dto.JeluUser
 import io.github.bayang.jelu.dto.LibraryFilter
 import io.github.bayang.jelu.dto.Role
+import io.github.bayang.jelu.dto.SeriesDto
 import io.github.bayang.jelu.dto.TagDto
 import io.github.bayang.jelu.dto.UserBookBulkUpdateDto
 import io.github.bayang.jelu.dto.UserBookLightDto
@@ -130,6 +131,16 @@ class BooksController(
         return ResponseEntity.noContent().build()
     }
 
+    @ApiResponse(responseCode = "204", description = "Deleted the series from the book")
+    @DeleteMapping(path = ["/books/{bookId}/series/{seriesId}"])
+    fun deleteSeriesFromBook(
+        @PathVariable("bookId") bookId: UUID,
+        @PathVariable("seriesId") seriesId: UUID,
+    ): ResponseEntity<Unit> {
+        repository.deleteSeriesFromBook(bookId, seriesId)
+        return ResponseEntity.noContent().build()
+    }
+
     @GetMapping(path = ["/userbooks"])
     fun userbooks(
         principal: Authentication,
@@ -180,6 +191,32 @@ class BooksController(
         return repository.findTagBooksById(tagId, (principal.principal as JeluUser).user, pageable, libraryFilter ?: LibraryFilter.ANY)
     }
 
+    @GetMapping(path = ["/series"])
+    fun series(
+        @RequestParam(name = "name", required = false) name: String?,
+        @PageableDefault(page = 0, size = 20, direction = Sort.Direction.ASC, sort = ["name"]) @ParameterObject pageable: Pageable,
+    ): Page<SeriesDto> = repository.findAllSeries(name, pageable)
+
+    @GetMapping(path = ["/series/{id}"])
+    fun seriesById(
+        @PathVariable("id") seriesId: UUID,
+        principal: Authentication,
+    ): SeriesDto {
+        assertIsJeluUser(principal.principal)
+        return repository.findSeriesById(seriesId)
+    }
+
+    @GetMapping(path = ["/series/{id}/books"])
+    fun seriesBooksById(
+        @PathVariable("id") seriesId: UUID,
+        @RequestParam(name = "libraryFilter", required = false) libraryFilter: LibraryFilter?,
+        @PageableDefault(page = 0, size = 20, direction = Sort.Direction.ASC, sort = ["title"]) @ParameterObject pageable: Pageable,
+        principal: Authentication,
+    ): Page<BookDto> {
+        assertIsJeluUser(principal.principal)
+        return repository.findSeriesBooksById(seriesId, (principal.principal as JeluUser).user, pageable, libraryFilter ?: LibraryFilter.ANY)
+    }
+
     @GetMapping(path = ["/authors/{id}"])
     fun authorById(@PathVariable("id") authorId: UUID): AuthorDto = repository.findAuthorsById(authorId)
 
diff --git a/src/main/kotlin/io/github/bayang/jelu/dao/BookRepository.kt b/src/main/kotlin/io/github/bayang/jelu/dao/BookRepository.kt
index dc9bfba3..b7e1e1fd 100644
--- a/src/main/kotlin/io/github/bayang/jelu/dao/BookRepository.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/dao/BookRepository.kt
@@ -8,6 +8,8 @@ import io.github.bayang.jelu.dto.CreateReadingEventDto
 import io.github.bayang.jelu.dto.CreateUserBookDto
 import io.github.bayang.jelu.dto.LibraryFilter
 import io.github.bayang.jelu.dto.Role
+import io.github.bayang.jelu.dto.SeriesOrderDto
+import io.github.bayang.jelu.dto.SeriesUpdateDto
 import io.github.bayang.jelu.dto.TagDto
 import io.github.bayang.jelu.dto.UserBookBulkUpdateDto
 import io.github.bayang.jelu.dto.UserBookUpdateDto
@@ -93,6 +95,8 @@ class BookRepository(
             .join(translatorsAlias, JoinType.LEFT, onColumn = translatorsAlias[AuthorTable.id], otherColumn = BookTranslators.translator)
             .join(BookTags, JoinType.LEFT, onColumn = BookTable.id, otherColumn = BookTags.book)
             .join(TagTable, JoinType.LEFT, onColumn = TagTable.id, otherColumn = BookTags.tag)
+            .join(BookSeries, JoinType.LEFT, onColumn = BookTable.id, otherColumn = BookSeries.book)
+            .join(SeriesTable, JoinType.LEFT, onColumn = SeriesTable.id, otherColumn = BookSeries.series)
             .slice(BookTable.columns)
             .selectAll()
             .withDistinct()
@@ -129,6 +133,8 @@ class BookRepository(
             .join(translatorsAlias, JoinType.LEFT, onColumn = translatorsAlias[AuthorTable.id], otherColumn = BookTranslators.translator)
             .join(BookTags, JoinType.LEFT, onColumn = BookTable.id, otherColumn = BookTags.book)
             .join(TagTable, JoinType.LEFT, onColumn = TagTable.id, otherColumn = BookTags.tag)
+            .join(BookSeries, JoinType.LEFT, onColumn = BookTable.id, otherColumn = BookSeries.book)
+            .join(SeriesTable, JoinType.LEFT, onColumn = SeriesTable.id, otherColumn = BookSeries.series)
             .slice(BookTable.columns)
             .selectAll()
             .withDistinct()
@@ -143,7 +149,7 @@ class BookRepository(
             query.andWhere { BookTable.isbn13 eq isbn13 }
         }
         if (!series?.trim().isNullOrBlank()) {
-            query.andWhere { BookTable.series like "%$series%" }
+            query.andWhere { SeriesTable.name like "%$series%" }
         }
         if (!authors.isNullOrEmpty()) {
             var first = true
@@ -203,6 +209,8 @@ class BookRepository(
             .join(translatorsAlias, JoinType.LEFT, onColumn = translatorsAlias[AuthorTable.id], otherColumn = BookTranslators.translator)
             .join(BookTags, JoinType.LEFT, onColumn = BookTable.id, otherColumn = BookTags.book)
             .join(TagTable, JoinType.LEFT, onColumn = TagTable.id, otherColumn = BookTags.tag)
+            .join(BookSeries, JoinType.LEFT, onColumn = BookTable.id, otherColumn = BookSeries.book)
+            .join(SeriesTable, JoinType.LEFT, onColumn = SeriesTable.id, otherColumn = BookSeries.series)
             .slice(BookTable.columns)
             .selectAll()
             .withDistinct()
@@ -217,7 +225,7 @@ class BookRepository(
             query.andWhere { BookTable.isbn13 eq isbn13 }
         }
         if (!series?.trim().isNullOrBlank()) {
-            query.andWhere { BookTable.series like "%$series%" }
+            query.andWhere { SeriesTable.name like "%$series%" }
         }
         if (!authors.isNullOrEmpty()) {
             var first = true
@@ -303,6 +311,22 @@ class BookRepository(
         )
     }
 
+    fun findAllSeries(name: String?, pageable: Pageable): Page<Series> {
+        val query: Query = SeriesTable.selectAll()
+        name?.let {
+            query.andWhere { SeriesTable.name like "%$name%" }
+        }
+        val total = query.count()
+        query.limit(pageable.pageSize, pageable.offset)
+        val orders: Array<Pair<Expression<*>, SortOrder>> = parseSorts(pageable.sort, Pair(SeriesTable.name, SortOrder.ASC_NULLS_LAST), SeriesTable)
+        query.orderBy(*orders)
+        return PageImpl(
+            query.map { resultRow -> Series.wrapRow(resultRow) },
+            pageable,
+            total,
+        )
+    }
+
     fun findAuthorsByName(name: String): List<Author> {
         return Author.find { AuthorTable.name like "%$name%" }.toList()
     }
@@ -311,12 +335,18 @@ class BookRepository(
         return Tag.find { TagTable.name.lowerCase() eq name.lowercase() }.toList()
     }
 
+    fun findSeriesByName(name: String): List<Series> {
+        return Series.find { SeriesTable.name.lowerCase() eq name.lowercase() }.toList()
+    }
+
     fun findBookById(bookId: UUID): Book = Book[bookId]
 
     fun findAuthorsById(authorId: UUID): Author = Author[authorId]
 
     fun findTagById(tagId: UUID): Tag = Tag[tagId]
 
+    fun findSeriesById(seriesId: UUID): Series = Series[seriesId]
+
     fun findTagBooksById(tagId: UUID, user: User, pageable: Pageable, filter: LibraryFilter = LibraryFilter.ANY): Page<Book> {
         val booksWithSameIdAndUserHasUserbook = BookTable.join(UserBookTable, JoinType.LEFT)
             .slice(BookTable.id)
@@ -345,6 +375,34 @@ class BookRepository(
         )
     }
 
+    fun findSeriesBooksById(seriesId: UUID, user: User, pageable: Pageable, filter: LibraryFilter = LibraryFilter.ANY): Page<Book> {
+        val booksWithSameIdAndUserHasUserbook = BookTable.join(UserBookTable, JoinType.LEFT)
+            .slice(BookTable.id)
+            .select { UserBookTable.book eq BookTable.id and (UserBookTable.user eq user.id) }
+            .withDistinct()
+        val query = BookTable.join(BookSeries, JoinType.LEFT)
+            .join(UserBookTable, JoinType.LEFT, onColumn = UserBookTable.book, otherColumn = BookTable.id)
+            .slice(BookTable.columns)
+            .select { BookSeries.series eq seriesId }
+        if (filter == LibraryFilter.ONLY_USER_BOOKS) {
+            // only books where user has an userbook
+            query.andWhere { UserBookTable.user eq user.id }
+        } else if (filter == LibraryFilter.ONLY_NON_USER_BOOKS) {
+            // only books where there are no userbooks or only other users have userbooks
+            query.andWhere { BookTable.id notInSubQuery booksWithSameIdAndUserHasUserbook }
+        }
+        query.withDistinct(true)
+        val total = query.count()
+        query.limit(pageable.pageSize, pageable.offset)
+        val orders: Array<Pair<Expression<*>, SortOrder>> = parseSorts(pageable.sort, Pair(BookTable.title, SortOrder.ASC_NULLS_LAST), BookTable)
+        query.orderBy(*orders)
+        return PageImpl(
+            query.map { resultRow -> wrapRow(resultRow, user.id.value) },
+            pageable,
+            total,
+        )
+    }
+
     fun findTagBooksByIdNoFilters(tagId: UUID, pageable: Pageable): Page<Book> {
         val query = BookTable.join(BookTags, JoinType.LEFT)
             .join(UserBookTable, JoinType.LEFT, onColumn = UserBookTable.book, otherColumn = BookTable.id)
@@ -424,6 +482,25 @@ class BookRepository(
         )
     }
 
+    fun findSeriesBooksByIdNoFilters(seriesId: UUID, pageable: Pageable): Page<Book> {
+        val query = BookTable.join(BookSeries, JoinType.LEFT)
+            .join(UserBookTable, JoinType.LEFT, onColumn = UserBookTable.book, otherColumn = BookTable.id)
+            .slice(BookTable.columns)
+            .select {
+                BookSeries.series eq seriesId
+            }
+        query.withDistinct(true)
+        val total = query.count()
+        query.limit(pageable.pageSize, pageable.offset)
+        val orders: Array<Pair<Expression<*>, SortOrder>> = parseSorts(pageable.sort, Pair(BookTable.title, SortOrder.ASC_NULLS_LAST), BookTable)
+        query.orderBy(*orders)
+        return PageImpl(
+            query.map { resultRow -> wrapRow(resultRow) },
+            pageable,
+            total,
+        )
+    }
+
     fun wrapRow(resultRow: ResultRow, userId: UUID): Book {
         val e = Book.wrapRow(resultRow)
         val userbook = e.userBooks.firstOrNull { u -> u.user.id.value == userId }
@@ -470,12 +547,6 @@ class BookRepository(
         book.publishedDate?.let {
             updated.publishedDate = book.publishedDate.trim()
         }
-        book.series?.let {
-            updated.series = book.series.trim()
-        }
-        book.numberInSeries?.let {
-            updated.numberInSeries = book.numberInSeries
-        }
         book.amazonId?.let {
             updated.amazonId = book.amazonId.trim()
         }
@@ -549,6 +620,36 @@ class BookRepository(
         if (tagsList.isNotEmpty()) {
             updated.tags = SizedCollection(tagsList)
         }
+        book.series?.forEach {
+            // first try to find exact match by id
+            var seriesEntity: Series? = if (it.seriesId != null) {
+                findSeriesById(it.seriesId)
+            }
+            // if no id provided or research by id doesn't return anything try to find by name
+            else {
+                findSeriesByName(it.name.trim()).firstOrNull()
+            }
+            if (seriesEntity != null) {
+                val alreadyExistingOnBook = updated.seriesAndOrder.find { s -> s.series.id == seriesEntity.id }
+                // this series is not yet on the book, save a new BookSeriesItem
+                if (alreadyExistingOnBook == null) {
+                    save(it, seriesEntity, updated)
+                } else {
+                    // juste update the already exsting BookSeriesItem to avoid duplicates
+                    update(it, seriesEntity, updated)
+                }
+            } else {
+                save(it, updated)
+            }
+        }
+        // remove preexisting series which are not in the update dto series
+        // which means they are no longer wanted
+        updated.seriesAndOrder.forEach { bsi ->
+            if (book.series?.find { s -> s.name == bsi.series.name } == null) {
+                logger.trace { "delete previously existing series not in updated list ${bsi.series.name}" }
+                BookSeries.deleteWhere { BookSeries.series eq(bsi.series.id) }
+            }
+        }
         return updated
     }
 
@@ -632,6 +733,15 @@ class BookRepository(
         return found
     }
 
+    fun updateSeries(seriesId: UUID, series: SeriesUpdateDto): Series {
+        val found: Series = Series[seriesId]
+        if (series.name.isNotBlank()) {
+            found.name = series.name.trim()
+        }
+        found.modificationDate = nowInstant()
+        return found
+    }
+
     fun save(book: BookCreateDto): Book {
         val authorsList = mutableListOf<Author>()
         book.authors?.forEach { authorDto ->
@@ -672,6 +782,7 @@ class BookRepository(
                 tagsList.add(save(it))
             }
         }
+
         val created = Book.new(UUID.randomUUID()) {
             this.title = book.title.trim()
             val instant: Instant = nowInstant()
@@ -684,18 +795,25 @@ class BookRepository(
             this.publishedDate = cleanString(book.publishedDate)
             this.publisher = cleanString(book.publisher)
             this.image = cleanString(book.image)
-            this.series = cleanString(book.series)
-            this.numberInSeries = book.numberInSeries
             this.amazonId = cleanString(book.amazonId)
             this.goodreadsId = cleanString(book.goodreadsId)
             this.googleId = cleanString(book.googleId)
             this.librarythingId = cleanString(book.librarythingId)
             this.language = cleanString(book.language)
         }
+        book.series?.forEach {
+            val seriesEntity: Series? = findSeriesByName(it.name.trim()).firstOrNull()
+            if (seriesEntity != null) {
+                save(it, seriesEntity, created)
+            } else {
+                save(it, created)
+            }
+        }
 
         created.authors = SizedCollection(authorsList)
         created.tags = SizedCollection(tagsList)
         created.translators = SizedCollection(translatorsList)
+
         // eager loading, see if we keep this in the long term
         created.load(Book::authors)
         created.load(Book::translators)
@@ -741,6 +859,58 @@ class BookRepository(
         return created
     }
 
+    fun saveSeries(series: SeriesUpdateDto): Series {
+        val created = Series.new(UUID.randomUUID()) {
+            this.name = series.name.trim()
+            val instant: Instant = nowInstant()
+            creationDate = instant
+            modificationDate = instant
+        }
+        return created
+    }
+
+    fun save(series: SeriesOrderDto, book: Book): BookSeriesItem {
+        val created = Series.new(UUID.randomUUID()) {
+            name = series.name.trim()
+            val instant: Instant = nowInstant()
+            creationDate = instant
+            modificationDate = instant
+        }
+        val withPosition = BookSeriesItem.new(UUID.randomUUID()) {
+            this.series = created
+            this.book = book
+            this.numberInSeries = series.numberInSeries
+        }
+        return withPosition
+    }
+
+    fun save(series: SeriesOrderDto, seriesEntity: Series, book: Book): BookSeriesItem? {
+        val existing =
+            BookSeriesItem.find { BookSeries.book eq book.id and (BookSeries.series eq seriesEntity.id) and (BookSeries.numberInSeries eq series.numberInSeries) }
+        if (existing.empty()) {
+            val withPosition = BookSeriesItem.new(UUID.randomUUID()) {
+                this.series = seriesEntity
+                this.book = book
+                this.numberInSeries = series.numberInSeries
+            }
+            return withPosition
+        }
+        return null
+    }
+
+    fun update(series: SeriesOrderDto, seriesEntity: Series, book: Book): BookSeriesItem? {
+        val existing =
+            BookSeriesItem.find { BookSeries.book eq book.id and (BookSeries.series eq seriesEntity.id) }
+        if (!existing.empty()) {
+            val item = existing.firstOrNull()
+            if (item != null) {
+                item.numberInSeries = series.numberInSeries
+            }
+            return item
+        }
+        return null
+    }
+
     fun save(book: Book, user: User, createUserBookDto: CreateUserBookDto): UserBook {
         val instant: Instant = nowInstant()
         return UserBook.new(UUID.randomUUID()) {
@@ -880,6 +1050,12 @@ class BookRepository(
         }
     }
 
+    fun deleteSeriesFromBook(bookId: UUID, seriesId: UUID) {
+        BookSeries.deleteWhere {
+            series eq seriesId and(book eq bookId)
+        }
+    }
+
     fun deleteTagsFromBook(bookId: UUID, tagIds: List<UUID>) {
         BookTags.deleteWhere {
             BookTags.tag inList tagIds and(BookTags.book eq bookId)
@@ -902,6 +1078,10 @@ class BookRepository(
         Tag[tagId].delete()
     }
 
+    fun deleteSeriesById(seriesId: UUID) {
+        Series[seriesId].delete()
+    }
+
     /**
      * Removes an author from a book without deleting the author from the database.
      * Used to clean the composite table
@@ -925,4 +1105,46 @@ class BookRepository(
             BookTranslators.book eq bookId and(BookTranslators.translator eq translatorId)
         }
     }
+
+    fun booksWithSeries(pageable: Pageable): Page<Book> {
+        val query = BookTable
+            .slice(BookTable.columns)
+            .select { BookTable.seriesBak.isNotNull() }
+            .withDistinct()
+
+        val total = query.count()
+        query.limit(pageable.pageSize, pageable.offset)
+        val orders: Array<Pair<Expression<*>, SortOrder>> = parseSorts(pageable.sort, Pair(BookTable.title, SortOrder.ASC_NULLS_LAST), BookTable)
+        query.orderBy(*orders)
+        return PageImpl(
+            query.map { resultRow -> wrapRow(resultRow) },
+            pageable,
+            total,
+        )
+    }
+
+    fun updateSeriesFromStringToDedicatedTable(book: Book) {
+        val seriesBak = book.seriesBak?.trim()
+        if (!seriesBak.isNullOrBlank()) {
+            val seriesEntity: Series? = findSeriesByName(seriesBak).firstOrNull()
+            if (seriesEntity != null) {
+                save(
+                    SeriesOrderDto(
+                        name = seriesBak,
+                        numberInSeries = book.numberInSeries,
+                    ),
+                    seriesEntity,
+                    book,
+                )
+            } else {
+                save(
+                    SeriesOrderDto(
+                        name = seriesBak,
+                        numberInSeries = book.numberInSeries,
+                    ),
+                    book,
+                )
+            }
+        }
+    }
 }
diff --git a/src/main/kotlin/io/github/bayang/jelu/dao/BookTable.kt b/src/main/kotlin/io/github/bayang/jelu/dao/BookTable.kt
index fe54842f..ffb3fd61 100644
--- a/src/main/kotlin/io/github/bayang/jelu/dao/BookTable.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/dao/BookTable.kt
@@ -21,7 +21,7 @@ object BookTable : UUIDTable("book") {
     val summary: Column<String?> = varchar("summary", 50000).nullable()
     val pageCount: Column<Int?> = integer(name = "page_count").nullable()
     val image: Column<String?> = varchar("image", 1000).nullable()
-    val series: Column<String?> = varchar("series", 500).nullable()
+    val seriesBak: Column<String?> = varchar("series_bak", 500).nullable()
     val numberInSeries: Column<Double?> = double(name = "number_in_series").nullable()
     val googleId: Column<String?> = varchar("google_id", 30).nullable()
     val goodreadsId: Column<String?> = varchar("goodreads_id", 30).nullable()
@@ -44,7 +44,8 @@ class Book(id: EntityID<UUID>) : UUIDEntity(id) {
     var translators by Author via BookTranslators
     var tags by Tag via BookTags
     var image by BookTable.image
-    var series by BookTable.series
+    var seriesBak by BookTable.seriesBak
+    val seriesAndOrder by BookSeriesItem.referrersOn(BookSeries.book)
     var language by BookTable.language
     var numberInSeries by BookTable.numberInSeries
     var googleId by BookTable.googleId
@@ -67,8 +68,8 @@ class Book(id: EntityID<UUID>) : UUIDEntity(id) {
             publishedDate = this.publishedDate,
             pageCount = this.pageCount,
             modificationDate = this.modificationDate,
-            series = this.series,
-            numberInSeries = this.numberInSeries,
+            // seriesBak = this.seriesBak,
+            // numberInSeries = this.numberInSeries,
             goodreadsId = this.goodreadsId,
             googleId = this.googleId,
             amazonId = this.amazonId,
@@ -78,6 +79,7 @@ class Book(id: EntityID<UUID>) : UUIDEntity(id) {
             translators = this.translators.map { it.toAuthorDto() },
             tags = this.tags.map { it.toTagDto() },
             userBookId = this.userBookId,
+            series = this.seriesAndOrder.map { it.toSeriesOrderDto() },
         )
 
     fun toBookUpdateDto(): BookUpdateDto =
@@ -90,8 +92,8 @@ class Book(id: EntityID<UUID>) : UUIDEntity(id) {
             publisher = this.publisher,
             publishedDate = this.publishedDate,
             pageCount = this.pageCount,
-            series = this.series,
-            numberInSeries = this.numberInSeries,
+            // seriesBak = this.seriesBak,
+            // numberInSeries = this.numberInSeries,
             goodreadsId = this.goodreadsId,
             googleId = this.googleId,
             amazonId = this.amazonId,
@@ -100,5 +102,6 @@ class Book(id: EntityID<UUID>) : UUIDEntity(id) {
             authors = this.authors.map { it.toAuthorDto() },
             translators = this.translators.map { it.toAuthorDto() },
             tags = this.tags.map { it.toTagDto() },
+            series = this.seriesAndOrder.map { it.toSeriesOrderDto() },
         )
 }
diff --git a/src/main/kotlin/io/github/bayang/jelu/dao/LifeCycleRepository.kt b/src/main/kotlin/io/github/bayang/jelu/dao/LifeCycleRepository.kt
new file mode 100644
index 00000000..2e16d606
--- /dev/null
+++ b/src/main/kotlin/io/github/bayang/jelu/dao/LifeCycleRepository.kt
@@ -0,0 +1,19 @@
+package io.github.bayang.jelu.dao
+
+import io.github.bayang.jelu.utils.nowInstant
+import org.springframework.stereotype.Repository
+
+@Repository
+class LifeCycleRepository {
+
+    fun findLifeCycle(): LifeCycle {
+        return LifeCycle.all().first()
+    }
+
+    fun setSeriesMigrated(newValue: Boolean): LifeCycle {
+        val lifeCycle = findLifeCycle()
+        lifeCycle.seriesMigrated = newValue
+        lifeCycle.modificationDate = nowInstant()
+        return lifeCycle
+    }
+}
diff --git a/src/main/kotlin/io/github/bayang/jelu/dao/LifeCycleTable.kt b/src/main/kotlin/io/github/bayang/jelu/dao/LifeCycleTable.kt
new file mode 100644
index 00000000..887ae869
--- /dev/null
+++ b/src/main/kotlin/io/github/bayang/jelu/dao/LifeCycleTable.kt
@@ -0,0 +1,28 @@
+package io.github.bayang.jelu.dao
+
+import io.github.bayang.jelu.dto.LifeCycleDto
+import org.jetbrains.exposed.dao.LongEntity
+import org.jetbrains.exposed.dao.LongEntityClass
+import org.jetbrains.exposed.dao.id.EntityID
+import org.jetbrains.exposed.dao.id.LongIdTable
+import org.jetbrains.exposed.sql.Column
+import org.jetbrains.exposed.sql.javatime.timestamp
+
+object LifeCycleTable : LongIdTable("lifecycle") {
+    val creationDate = timestamp("creation_date")
+    val modificationDate = timestamp("modification_date")
+    val seriesMigrated: Column<Boolean> = bool("series_migrated")
+}
+class LifeCycle(id: EntityID<Long>) : LongEntity(id) {
+    companion object : LongEntityClass<LifeCycle>(LifeCycleTable)
+    var creationDate by LifeCycleTable.creationDate
+    var modificationDate by LifeCycleTable.modificationDate
+    var seriesMigrated by LifeCycleTable.seriesMigrated
+
+    fun toLifeCycleDto(): LifeCycleDto = LifeCycleDto(
+        creationDate = this.creationDate,
+        modificationDate = this.modificationDate,
+        seriesMigrated = this.seriesMigrated,
+        id = this.id.value,
+    )
+}
diff --git a/src/main/kotlin/io/github/bayang/jelu/dao/SeriesTable.kt b/src/main/kotlin/io/github/bayang/jelu/dao/SeriesTable.kt
new file mode 100644
index 00000000..d586446d
--- /dev/null
+++ b/src/main/kotlin/io/github/bayang/jelu/dao/SeriesTable.kt
@@ -0,0 +1,65 @@
+package io.github.bayang.jelu.dao
+
+import io.github.bayang.jelu.dto.SeriesDto
+import io.github.bayang.jelu.dto.SeriesOrderDto
+import org.jetbrains.exposed.dao.UUIDEntity
+import org.jetbrains.exposed.dao.UUIDEntityClass
+import org.jetbrains.exposed.dao.id.EntityID
+import org.jetbrains.exposed.dao.id.UUIDTable
+import org.jetbrains.exposed.sql.Column
+import org.jetbrains.exposed.sql.ColumnSet
+import org.jetbrains.exposed.sql.ReferenceOption
+import org.jetbrains.exposed.sql.ResultRow
+import org.jetbrains.exposed.sql.javatime.timestamp
+import java.util.UUID
+
+object SeriesTable : UUIDTable("series") {
+    val name: Column<String> = varchar("name", 1000)
+    val creationDate = timestamp("creation_date")
+    val modificationDate = timestamp("modification_date")
+}
+class Series(id: EntityID<UUID>) : UUIDEntity(id) {
+    companion object : UUIDEntityClass<Series>(SeriesTable)
+    var name by SeriesTable.name
+    var creationDate by SeriesTable.creationDate
+    var modificationDate by SeriesTable.modificationDate
+    fun toSeriesDto(): SeriesDto =
+        SeriesDto(
+            id = this.id.value,
+            creationDate = this.creationDate,
+            modificationDate = this.modificationDate,
+            name = this.name,
+        )
+}
+object BookSeries : UUIDTable(name = "book_series") {
+    val book = reference("book", BookTable, fkName = "fk_bookseries_book_id", onDelete = ReferenceOption.CASCADE)
+    val series = reference("series", SeriesTable, fkName = "fk_bookseries_series_id", onDelete = ReferenceOption.CASCADE)
+    val numberInSeries: Column<Double?> = double(name = "number_in_series").nullable()
+    init {
+        // actually the work is done in the liquibase part
+        // this is only to convey the intent
+        uniqueIndex(book, series, numberInSeries)
+    }
+}
+class BookSeriesItem(id: EntityID<UUID>) : UUIDEntity(id) {
+    companion object : UUIDEntityClass<BookSeriesItem>(BookSeries) {
+        override val dependsOnTables: ColumnSet = BookTable.innerJoin(BookSeries).innerJoin(SeriesTable)
+        override fun createInstance(entityId: EntityID<UUID>, row: ResultRow?): BookSeriesItem {
+            row?.getOrNull(BookTable.id)?.let {
+                Book.wrap(it, row)
+            }
+            row?.getOrNull(SeriesTable.id)?.let {
+                Series.wrap(it, row)
+            }
+            return super.createInstance(entityId, row)
+        }
+    }
+    var book by Book referencedOn BookSeries.book
+    var series by Series referencedOn BookSeries.series
+    var numberInSeries by BookSeries.numberInSeries
+    fun toSeriesOrderDto(): SeriesOrderDto = SeriesOrderDto(
+        seriesId = this.series.id.value,
+        name = this.series.name,
+        numberInSeries = this.numberInSeries,
+    )
+}
diff --git a/src/main/kotlin/io/github/bayang/jelu/dto/BookDto.kt b/src/main/kotlin/io/github/bayang/jelu/dto/BookDto.kt
index 2e7f1e8e..1c356a52 100644
--- a/src/main/kotlin/io/github/bayang/jelu/dto/BookDto.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/dto/BookDto.kt
@@ -18,8 +18,7 @@ data class BookDto(
     val authors: List<AuthorDto>?,
     val translators: List<AuthorDto>?,
     val tags: List<TagDto>?,
-    val series: String?,
-    val numberInSeries: Double?,
+    val series: List<SeriesOrderDto>?,
     val googleId: String?,
     val amazonId: String?,
     val goodreadsId: String?,
@@ -41,8 +40,7 @@ data class BookCreateDto(
     var authors: List<AuthorDto>? = null,
     var translators: List<AuthorDto>? = null,
     var tags: List<TagDto>? = null,
-    var series: String? = null,
-    var numberInSeries: Double? = null,
+    var series: List<SeriesOrderDto>? = null,
     var googleId: String? = null,
     var amazonId: String? = null,
     var goodreadsId: String? = null,
@@ -62,13 +60,12 @@ data class BookUpdateDto(
     var authors: List<AuthorDto>?,
     var translators: List<AuthorDto>?,
     val tags: List<TagDto>?,
-    val series: String?,
-    val numberInSeries: Double?,
     val googleId: String?,
     val amazonId: String?,
     val goodreadsId: String?,
     val librarythingId: String?,
     val language: String?,
+    var series: List<SeriesOrderDto>?,
 )
 
 data class AuthorDto(
@@ -127,12 +124,26 @@ fun fromBookCreateDto(dto: BookCreateDto): BookUpdateDto {
         authors = dto.authors,
         translators = dto.translators,
         tags = dto.tags,
-        series = dto.series,
-        numberInSeries = dto.numberInSeries,
         googleId = dto.googleId,
         amazonId = dto.amazonId,
         goodreadsId = dto.goodreadsId,
         librarythingId = dto.librarythingId,
         language = dto.language,
+        series = dto.series,
     )
 }
+
+data class SeriesDto(
+    val id: UUID?,
+    val creationDate: Instant?,
+    val modificationDate: Instant?,
+    val name: String,
+)
+data class SeriesOrderDto(
+    val seriesId: UUID? = null,
+    var name: String,
+    var numberInSeries: Double?,
+)
+data class SeriesUpdateDto(
+    val name: String,
+)
diff --git a/src/main/kotlin/io/github/bayang/jelu/dto/LifeCycleDto.kt b/src/main/kotlin/io/github/bayang/jelu/dto/LifeCycleDto.kt
new file mode 100644
index 00000000..91634f2f
--- /dev/null
+++ b/src/main/kotlin/io/github/bayang/jelu/dto/LifeCycleDto.kt
@@ -0,0 +1,10 @@
+package io.github.bayang.jelu.dto
+
+import java.time.Instant
+
+data class LifeCycleDto(
+    val id: Long,
+    val creationDate: Instant?,
+    val modificationDate: Instant?,
+    val seriesMigrated: Boolean,
+)
diff --git a/src/main/kotlin/io/github/bayang/jelu/search/LuceneEntity.kt b/src/main/kotlin/io/github/bayang/jelu/search/LuceneEntity.kt
index 65511d42..1319923e 100644
--- a/src/main/kotlin/io/github/bayang/jelu/search/LuceneEntity.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/search/LuceneEntity.kt
@@ -30,7 +30,10 @@ fun Book.toDocument() =
         translators.forEach {
             add(TextField("translator", it.name, Field.Store.NO))
         }
-        if (!series.isNullOrBlank()) add(TextField("series", series, Field.Store.NO))
+        if (!seriesBak.isNullOrBlank()) add(TextField("series", seriesBak, Field.Store.NO))
+        seriesAndOrder.forEach {
+            add(TextField("series", it.series.name, Field.Store.NO))
+        }
         if (!language.isNullOrBlank()) add(TextField("language", language, Field.Store.NO))
         if (!publishedDate.isNullOrBlank()) add(TextField("published_date", publishedDate, Field.Store.NO))
         if (!publisher.isNullOrBlank()) add(TextField("publisher", publisher, Field.Store.NO))
diff --git a/src/main/kotlin/io/github/bayang/jelu/service/AppLifecycleAware.kt b/src/main/kotlin/io/github/bayang/jelu/service/AppLifecycleAware.kt
index 372192c1..a0e02b20 100644
--- a/src/main/kotlin/io/github/bayang/jelu/service/AppLifecycleAware.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/service/AppLifecycleAware.kt
@@ -7,6 +7,9 @@ import org.springframework.context.event.ContextRefreshedEvent
 import org.springframework.context.event.EventListener
 import org.springframework.stereotype.Component
 import java.io.File
+import java.time.OffsetDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 
 private val logger = KotlinLogging.logger {}
 
@@ -15,6 +18,8 @@ class AppLifecycleAware(
     private val properties: JeluProperties,
     private val luceneHelper: LuceneHelper,
     private val searchIndexService: SearchIndexService,
+    private val lifeCycleService: LifeCycleService,
+    private val bookService: BookService,
 ) {
 
     @EventListener
@@ -40,5 +45,17 @@ class AppLifecycleAware(
                 searchIndexService.rebuildIndex()
             }
         }
+        val lifeCycle = lifeCycleService.getLifeCycle()
+        if (!lifeCycle.seriesMigrated) {
+            val start = System.currentTimeMillis()
+            val nowString: String = OffsetDateTime.now(ZoneId.systemDefault()).format(DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss"))
+            logger.info { "Series data not migrated, starting migration at at $nowString" }
+            bookService.migrateSeries()
+            var end = System.currentTimeMillis()
+            var deltaInSec = (end - start) / 1000
+            logger.info { "Series data migration completed after : $deltaInSec seconds, check your data" }
+            val seriesMigrated = lifeCycleService.setSeriesMigrated()
+            logger.debug { "lifeCycled updated to ${seriesMigrated.seriesMigrated}" }
+        }
     }
 }
diff --git a/src/main/kotlin/io/github/bayang/jelu/service/BookService.kt b/src/main/kotlin/io/github/bayang/jelu/service/BookService.kt
index 757ea13e..809b174e 100644
--- a/src/main/kotlin/io/github/bayang/jelu/service/BookService.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/service/BookService.kt
@@ -17,6 +17,8 @@ import io.github.bayang.jelu.dto.CreateReadingEventDto
 import io.github.bayang.jelu.dto.CreateUserBookDto
 import io.github.bayang.jelu.dto.LibraryFilter
 import io.github.bayang.jelu.dto.Role
+import io.github.bayang.jelu.dto.SeriesDto
+import io.github.bayang.jelu.dto.SeriesUpdateDto
 import io.github.bayang.jelu.dto.TagDto
 import io.github.bayang.jelu.dto.UserBookBulkUpdateDto
 import io.github.bayang.jelu.dto.UserBookLightDto
@@ -100,6 +102,9 @@ class BookService(
     @Transactional
     fun findAllTags(name: String?, pageable: Pageable): Page<TagDto> = bookRepository.findAllTags(name, pageable).map { it.toTagDto() }
 
+    @Transactional
+    fun findAllSeries(name: String?, pageable: Pageable): Page<SeriesDto> = bookRepository.findAllSeries(name, pageable).map { it.toSeriesDto() }
+
     @Transactional
     fun findBookById(bookId: UUID): BookDto = bookRepository.findBookById(bookId).toBookDto()
 
@@ -326,6 +331,13 @@ class BookService(
         return updated.toAuthorDto()
     }
 
+    @Transactional
+    fun updateSeries(seriesId: UUID, series: SeriesUpdateDto): SeriesDto {
+        val res = bookRepository.updateSeries(seriesId, series)
+        searchIndexService.seriesUpdated(seriesId)
+        return res.toSeriesDto()
+    }
+
     @Transactional
     fun findUserBookById(userbookId: UUID): UserBookLightDto = bookRepository.findUserBookById(userbookId).toUserBookLightDto()
 
@@ -352,11 +364,26 @@ class BookService(
         return bookRepository.findTagBooksById(tagId, user, pageable, libaryFilter).map { book -> book.toBookDto() }
     }
 
+    @Transactional
+    fun findSeriesBooksById(seriesId: UUID, user: User, pageable: Pageable, libaryFilter: LibraryFilter): Page<BookDto> {
+        return bookRepository.findSeriesBooksById(seriesId, user, pageable, libaryFilter).map { book -> book.toBookDto() }
+    }
+
+    @Transactional
+    fun findSeriesById(seriesId: UUID): SeriesDto {
+        return bookRepository.findSeriesById(seriesId).toSeriesDto()
+    }
+
     @Transactional
     fun save(tag: TagDto): TagDto {
         return bookRepository.save(tag).toTagDto()
     }
 
+    @Transactional
+    fun saveSeries(series: SeriesUpdateDto): SeriesDto {
+        return bookRepository.saveSeries(series).toSeriesDto()
+    }
+
     @Transactional
     fun deleteUserBookById(userbookId: UUID) {
         bookRepository.deleteUserBookById(userbookId)
@@ -403,6 +430,25 @@ class BookService(
         searchIndexService.booksUpdated(bookIds)
     }
 
+    @Transactional
+    fun deleteSeriesById(seriesId: UUID) {
+        var books: Page<Book>
+        val bookIds: MutableList<UUID> = mutableListOf()
+        do {
+            books = bookRepository.findSeriesBooksByIdNoFilters(seriesId, Pageable.ofSize(30))
+            books.forEach { bookIds.add(it.id.value) }
+        }
+        while (books.hasNext())
+        bookRepository.deleteSeriesById(seriesId)
+        searchIndexService.booksUpdated(bookIds)
+    }
+
+    @Transactional
+    fun deleteSeriesFromBook(bookId: UUID, seriesId: UUID) {
+        bookRepository.deleteSeriesFromBook(bookId, seriesId)
+        searchIndexService.bookUpdated(bookId)
+    }
+
     /**
      * Removes an author from a book without deleting the author from the database.
      * The author is removed only from that book.
@@ -496,4 +542,19 @@ class BookService(
         searchIndexService.authorUpdated(res.id.value)
         return res.toAuthorDto()
     }
+
+    @Transactional
+    fun migrateSeries() {
+        var pageNum = 0
+        val size = 30
+        do {
+            val booksPage: Page<Book> = bookRepository.booksWithSeries(PageRequest.of(pageNum, size))
+            if (booksPage.hasContent()) {
+                for (book in booksPage.content) {
+                    bookRepository.updateSeriesFromStringToDedicatedTable(book)
+                }
+                pageNum++
+            }
+        } while (booksPage.hasNext())
+    }
 }
diff --git a/src/main/kotlin/io/github/bayang/jelu/service/LifeCycleService.kt b/src/main/kotlin/io/github/bayang/jelu/service/LifeCycleService.kt
new file mode 100644
index 00000000..5df81c2b
--- /dev/null
+++ b/src/main/kotlin/io/github/bayang/jelu/service/LifeCycleService.kt
@@ -0,0 +1,18 @@
+package io.github.bayang.jelu.service
+
+import io.github.bayang.jelu.dao.LifeCycleRepository
+import io.github.bayang.jelu.dto.LifeCycleDto
+import org.springframework.stereotype.Component
+import org.springframework.transaction.annotation.Transactional
+
+@Component
+class LifeCycleService(
+    private val lifeCycleRepository: LifeCycleRepository,
+) {
+
+    @Transactional
+    fun getLifeCycle(): LifeCycleDto = lifeCycleRepository.findLifeCycle().toLifeCycleDto()
+
+    @Transactional
+    fun setSeriesMigrated(newValue: Boolean = true): LifeCycleDto = lifeCycleRepository.setSeriesMigrated(newValue).toLifeCycleDto()
+}
diff --git a/src/main/kotlin/io/github/bayang/jelu/service/SearchIndexService.kt b/src/main/kotlin/io/github/bayang/jelu/service/SearchIndexService.kt
index deccbf8f..27bab6ca 100644
--- a/src/main/kotlin/io/github/bayang/jelu/service/SearchIndexService.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/service/SearchIndexService.kt
@@ -105,6 +105,16 @@ class SearchIndexService(
         while (books.hasNext())
     }
 
+    fun seriesUpdated(seriesId: UUID) {
+        var books: Page<Book>
+        do {
+            books = bookRepository.findSeriesBooksByIdNoFilters(seriesId, Pageable.ofSize(30))
+            books.forEach { deleteEntity(LuceneEntity.Book, it.id.value.toString()) }
+            books.forEach { addEntity(it.toDocument()) }
+        }
+        while (books.hasNext())
+    }
+
     private fun addEntity(doc: Document) {
         luceneHelper.getIndexWriter().use { indexWriter ->
             indexWriter.addDocument(doc)
diff --git a/src/main/kotlin/io/github/bayang/jelu/service/imports/CsvImportService.kt b/src/main/kotlin/io/github/bayang/jelu/service/imports/CsvImportService.kt
index cba33ca5..cbc14ac0 100644
--- a/src/main/kotlin/io/github/bayang/jelu/service/imports/CsvImportService.kt
+++ b/src/main/kotlin/io/github/bayang/jelu/service/imports/CsvImportService.kt
@@ -17,6 +17,7 @@ import io.github.bayang.jelu.dto.ImportDto
 import io.github.bayang.jelu.dto.LibraryFilter
 import io.github.bayang.jelu.dto.MetadataDto
 import io.github.bayang.jelu.dto.MetadataRequestDto
+import io.github.bayang.jelu.dto.SeriesOrderDto
 import io.github.bayang.jelu.dto.TagDto
 import io.github.bayang.jelu.dto.UserBookLightDto
 import io.github.bayang.jelu.dto.UserBookUpdateDto
@@ -375,6 +376,16 @@ class CsvImportService(
             }
             incoming.tags!!.filter { tagDto -> !existingTagsNames.contains(tagDto.name.lowercase()) }.forEach { tagDto -> tags.add(tagDto) }
         }
+        val series = mutableListOf<SeriesOrderDto>()
+        // only save series not already in db
+        if (incoming.series != null) {
+            val existingSeriesNames: Set<String> = if (dbBook.series != null) {
+                dbBook.series.stream().map { it.name }.map { it.lowercase() }.collect(Collectors.toSet())
+            } else {
+                setOf()
+            }
+            incoming.series!!.filter { seriesDto -> !existingSeriesNames.contains(seriesDto.name.lowercase()) }.forEach { seriesDto -> series.add(seriesDto) }
+        }
         return incoming.copy(
             id = dbBook.id,
             title = dbBook.title.ifBlank { incoming.title },
@@ -384,8 +395,8 @@ class CsvImportService(
             publisher = if (dbBook.publisher.isNullOrBlank()) incoming.publisher else null,
             pageCount = if (dbBook.pageCount == null) incoming.pageCount else null,
             publishedDate = if (dbBook.publishedDate.isNullOrBlank()) incoming.publishedDate else null,
-            series = if (dbBook.series.isNullOrBlank()) incoming.series else null,
-            numberInSeries = if (dbBook.numberInSeries == null) incoming.numberInSeries else null,
+            series = series,
+            // numberInSeries = if (dbBook.numberInSeries == null) incoming.numberInSeries else null,
             googleId = if (dbBook.googleId.isNullOrBlank()) incoming.googleId else null,
             amazonId = if (dbBook.amazonId.isNullOrBlank()) incoming.amazonId else null,
             goodreadsId = if (dbBook.goodreadsId.isNullOrBlank()) incoming.goodreadsId else null,
@@ -410,12 +421,12 @@ class CsvImportService(
         book.librarythingId = importEntity.librarythingId
         book.isbn10 = testValues(importEntity.isbn10, metadata.isbn10)
         book.isbn13 = testValues(importEntity.isbn13, metadata.isbn13)
-        book.numberInSeries = metadata.numberInSeries
+        // book.numberInSeries = metadata.numberInSeries
         book.pageCount = importEntity.numberOfPages ?: metadata.pageCount
         book.publishedDate = testValues(importEntity.publishedDate, metadata.publishedDate)
         book.publisher = testValues(importEntity.publisher, metadata.publisher)
         book.summary = metadata.summary
-        book.series = metadata.series
+        // book.seriesBak = metadata.series
         book.image = metadata.image
         val authorsStrings = mutableSetOf<String>()
         authorsStrings.addAll(metadata.authors)
@@ -427,6 +438,10 @@ class CsvImportService(
         for (authorString in authorsStrings) {
             authors.add(AuthorDto(null, null, null, authorString, null, null, null, null, null, null, null, null, null, null, null))
         }
+        val seriesString = metadata.series
+        if (!seriesString.isNullOrBlank()) {
+            book.series = listOf(SeriesOrderDto(name = seriesString, numberInSeries = metadata.numberInSeries))
+        }
         book.authors = authors
         return book
     }
diff --git a/src/main/resources/liquibase.xml b/src/main/resources/liquibase.xml
index fad3dea6..4bdcdbd3 100644
--- a/src/main/resources/liquibase.xml
+++ b/src/main/resources/liquibase.xml
@@ -443,4 +443,67 @@
             UPDATE reading_event SET end_date = modification_date where end_date is null and event_type != 'CURRENTLY_READING';
         </sql>
     </changeSet>
+    <changeSet id="refactor-series" author="byng">
+        <sql>
+            ALTER TABLE book RENAME COLUMN "series" TO "series_bak";
+        </sql>
+        <createTable tableName="series">
+            <column name="id" type="binary(16)" remarks="Technical ID">
+                <constraints primaryKey="true" nullable="false" />
+            </column>
+            <column name="creation_date" type="timestamp"
+                    remarks="date of creation">
+                <constraints nullable="false" />
+            </column>
+            <column name="modification_date" type="timestamp"
+                    remarks="date of modification">
+                <constraints nullable="false" />
+            </column>
+            <column name="name" type="varchar(1000)"
+                    remarks="The series name ">
+                <constraints nullable="false" />
+            </column>
+        </createTable>
+        <createTable tableName="book_series">
+            <column name="id" type="binary(16)" remarks="Technical ID">
+                <constraints primaryKey="true" nullable="false" />
+            </column>
+            <column name="series" type="binary(16)" remarks="Technical ID">
+                <constraints foreignKeyName="fk_bookseries_series_id" references="series(id)" nullable="false" deleteCascade="true" />
+            </column>
+            <column name="book" type="binary(16)" remarks="Technical ID">
+                <constraints foreignKeyName="fk_bookseries_book_id" references="book(id)" nullable="false" deleteCascade="true" />
+            </column>
+            <column name="number_in_series" type="double"
+                    remarks="The book's number in series ">
+            </column>
+        </createTable>
+        <createIndex indexName="idx_book_series_position" tableName="book_series" unique="true">
+            <column name="series"/>
+            <column name="book"/>
+            <column name="number_in_series"/>
+        </createIndex>
+        <createTable tableName="lifecycle">
+            <column name="id" type="bigint" remarks="Technical ID">
+                <constraints primaryKey="true" nullable="false" />
+            </column>
+            <column name="creation_date" type="timestamp"
+                    remarks="date of creation">
+                <constraints nullable="false" />
+            </column>
+            <column name="modification_date" type="timestamp"
+                    remarks="date of modification">
+                <constraints nullable="false" />
+            </column>
+            <column name="series_migrated" type="boolean"
+                    remarks="The series have been migrated from old format or not "
+            defaultValueBoolean="false">
+                <constraints nullable="false" />
+            </column>
+        </createTable>
+        <sql>
+            INSERT INTO lifecycle("id", "creation_date", "modification_date", "series_migrated")
+            VALUES (1000, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, false);
+        </sql>
+    </changeSet>
 </databaseChangeLog>
diff --git a/src/test/kotlin/io/github/bayang/jelu/TestHelpers.kt b/src/test/kotlin/io/github/bayang/jelu/TestHelpers.kt
index 8aacc7ba..968d6669 100644
--- a/src/test/kotlin/io/github/bayang/jelu/TestHelpers.kt
+++ b/src/test/kotlin/io/github/bayang/jelu/TestHelpers.kt
@@ -33,9 +33,9 @@ fun bookDto(title: String = "title1", withTags: Boolean = false): BookCreateDto
         publisher = "test-publisher",
         pageCount = 50,
         publishedDate = "",
-        series = "",
+        // seriesBak = "",
         authors = mutableListOf(authorDto()),
-        numberInSeries = null,
+        // numberInSeries = null,
         tags = if (withTags) tags() else emptyList(),
         goodreadsId = "4321abc",
         googleId = "1234",
diff --git a/src/test/kotlin/io/github/bayang/jelu/service/BookServiceTest.kt b/src/test/kotlin/io/github/bayang/jelu/service/BookServiceTest.kt
index 1bce914f..d9d44746 100644
--- a/src/test/kotlin/io/github/bayang/jelu/service/BookServiceTest.kt
+++ b/src/test/kotlin/io/github/bayang/jelu/service/BookServiceTest.kt
@@ -13,8 +13,11 @@ import io.github.bayang.jelu.dto.BookDto
 import io.github.bayang.jelu.dto.CreateUserDto
 import io.github.bayang.jelu.dto.JeluUser
 import io.github.bayang.jelu.dto.LibraryFilter
+import io.github.bayang.jelu.dto.SeriesOrderDto
+import io.github.bayang.jelu.dto.SeriesUpdateDto
 import io.github.bayang.jelu.dto.UserBookLightDto
 import io.github.bayang.jelu.dto.UserBookUpdateDto
+import io.github.bayang.jelu.dto.fromBookCreateDto
 import io.github.bayang.jelu.search.LuceneEntity
 import io.github.bayang.jelu.search.LuceneHelper
 import io.github.bayang.jelu.tagDto
@@ -22,6 +25,7 @@ import io.github.bayang.jelu.tags
 import io.github.bayang.jelu.utils.nowInstant
 import io.github.bayang.jelu.utils.slugify
 import org.apache.lucene.index.Term
+import org.jetbrains.exposed.dao.exceptions.EntityNotFoundException
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions
@@ -68,7 +72,7 @@ class BookServiceTest(
 
     @AfterEach
     fun cleanTest() {
-        tempDir.listFiles().forEach {
+        tempDir.listFiles()?.forEach {
             it.deleteRecursively()
         }
         readingEventService.findAll(null, null, null, null, null, null, null, Pageable.ofSize(30)).content.forEach {
@@ -82,6 +86,9 @@ class BookServiceTest(
         bookService.findAllTags(null, Pageable.ofSize(20)).content.forEach {
             bookService.deleteTagById(it.id!!)
         }
+        bookService.findAllSeries(null, Pageable.ofSize(20)).content.forEach {
+            bookService.deleteSeriesById(it.id!!)
+        }
         luceneHelper.getIndexWriter().use { indexWriter ->
             indexWriter.deleteDocuments(Term(LuceneEntity.TYPE, LuceneEntity.Book.type))
             indexWriter.deleteDocuments(Term(LuceneEntity.TYPE, LuceneEntity.Author.type))
@@ -146,6 +153,787 @@ class BookServiceTest(
         Assertions.assertTrue(replaced.image?.contains(slugify(updated.name), true)!!)
     }
 
+    @Test
+    fun testInsertBooksSeries() {
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0, seriesId = null)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = 1.0, seriesId = null)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertEquals(1.0, it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testInsertBooksSeriesNoPosition() {
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = null)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = 1.0)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            if (it.name == "series 1") {
+                Assertions.assertNull(it.numberInSeries)
+            } else {
+                Assertions.assertEquals(1.0, it.numberInSeries)
+            }
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testInsertBooksSeriesBothNoPosition() {
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = null)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = null)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertNull(it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testInsertBooksSeriesBothNoPositionDuplicateSeries() {
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = null)
+        val s2 = SeriesOrderDto(name = "series 1", numberInSeries = null)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(1, res.series?.size)
+        Assertions.assertNull(res.series?.get(0)?.numberInSeries)
+        Assertions.assertEquals("series 1", res.series?.get(0)?.name)
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testInsertBooksSeriesBothNoPositionDuplicateExistingSeries() {
+        val saved = bookService.saveSeries(SeriesUpdateDto("series 1"))
+        Assertions.assertEquals("series 1", saved.name)
+        Assertions.assertNotNull(saved.id)
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = null)
+        val s2 = SeriesOrderDto(name = "series 1", numberInSeries = null)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(1, res.series?.size)
+        Assertions.assertNull(res.series?.get(0)?.numberInSeries)
+        Assertions.assertEquals("series 1", res.series?.get(0)?.name)
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testInsertBooksSeriesBothNoPositionExistingSeries() {
+        val saved = bookService.saveSeries(SeriesUpdateDto("series 1"))
+        Assertions.assertEquals("series 1", saved.name)
+        Assertions.assertNotNull(saved.id)
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = null)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = null)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertNull(it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testInsertBooksExistingSeries() {
+        val saved = bookService.saveSeries(SeriesUpdateDto("series 1"))
+        Assertions.assertEquals("series 1", saved.name)
+        Assertions.assertNotNull(saved.id)
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = 1.0)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertEquals(1.0, it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testUpdateBooksSeries() {
+        val saved = bookService.saveSeries(SeriesUpdateDto("series 1"))
+        Assertions.assertEquals("series 1", saved.name)
+        Assertions.assertNotNull(saved.id)
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = 1.0)
+        val bookCreateDto = BookCreateDto(
+            id = null,
+            title = "title1",
+            isbn10 = "",
+            isbn13 = "",
+            summary = "",
+            image = "",
+            publisher = "",
+            pageCount = 50,
+            publishedDate = "",
+            // seriesBak = "",
+            authors = emptyList(),
+            // numberInSeries = null,
+            tags = emptyList(),
+            goodreadsId = "",
+            googleId = "",
+            librarythingId = "",
+            language = "",
+            amazonId = "",
+            series = listOf(s1, s2),
+        )
+        var res: BookDto = bookService.save(
+            bookCreateDto,
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        var names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertEquals(1.0, it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        val series2Id = res.series?.get(1)?.seriesId
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        var updateDto = fromBookCreateDto(bookCreateDto)
+        val list = listOf(res.series?.get(0)!!, SeriesOrderDto(name = "series 3", numberInSeries = 1.0))
+        updateDto.series = list
+        // change series 1 position, remove series 2 and add a new third series
+        updateDto.series?.get(0)?.numberInSeries = 2.2
+        res = bookService.update(res.id!!, updateDto)
+        Assertions.assertEquals(2, res.series?.size)
+        Assertions.assertEquals("series 1", res.series?.get(0)?.name)
+        Assertions.assertEquals(2.2, res.series?.get(0)?.numberInSeries)
+
+        Assertions.assertEquals("series 3", res.series?.get(1)?.name)
+        Assertions.assertEquals(1.0, res.series?.get(1)?.numberInSeries)
+
+        // series still exists, without books
+        val series = bookService.findAllSeries(name = "series2", Pageable.ofSize(5))
+        Assertions.assertEquals("series2", series.content[0].name)
+
+        val booksById1 =
+            bookService.findSeriesBooksById(saved.id!!, user(), Pageable.ofSize(10), LibraryFilter.ANY)
+        Assertions.assertEquals(1, booksById1.totalElements)
+
+        val booksById2 =
+            bookService.findSeriesBooksById(series2Id!!, user(), Pageable.ofSize(10), LibraryFilter.ANY)
+        Assertions.assertEquals(0, booksById2.totalElements)
+    }
+
+    @Test
+    fun testInsertBooksExistingSeriesDifferentPosition() {
+        val saved = bookService.saveSeries(SeriesUpdateDto("series 1"))
+        Assertions.assertEquals("series 1", saved.name)
+        Assertions.assertNotNull(saved.id)
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0)
+        val s2 = SeriesOrderDto(name = "series 1", numberInSeries = 1.5)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val positions = listOf(s1.numberInSeries, s2.numberInSeries)
+        res.series?.forEach {
+            Assertions.assertEquals("series 1", it.name)
+            Assertions.assertTrue(positions.contains(it.numberInSeries))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testInsertBooksExistingDuplicateSeries() {
+        val saved = bookService.saveSeries(SeriesUpdateDto("series 1"))
+        Assertions.assertEquals("series 1", saved.name)
+        Assertions.assertNotNull(saved.id)
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0)
+        val s2 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(1, res.series?.size)
+        Assertions.assertEquals(1.0, res.series?.get(0)?.numberInSeries)
+        Assertions.assertEquals("series 1", res.series?.get(0)?.name)
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
+    @Test
+    fun testDeleteSeriesFromBook() {
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0, seriesId = null)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = 1.0, seriesId = null)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertEquals(1.0, it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        val series1Id = res.series?.get(0)?.seriesId
+
+        bookService.deleteSeriesFromBook(res.id!!, res.series?.get(0)?.seriesId!!)
+        val afterDelete = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(1, afterDelete.series?.size)
+        Assertions.assertEquals("series2", afterDelete.series?.get(0)?.name)
+        Assertions.assertEquals(1.0, afterDelete.series?.get(0)?.numberInSeries)
+
+        val seriesById = bookService.findSeriesById(series1Id!!)
+        Assertions.assertEquals("series 1", seriesById.name)
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(0, entitiesIds?.size)
+    }
+
+    @Test
+    fun testDeleteSeriesFromDbCascadesToBook() {
+        val s1 = SeriesOrderDto(name = "series 1", numberInSeries = 1.0, seriesId = null)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = 1.0, seriesId = null)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertEquals(1.0, it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        val series1Id = res.series?.get(0)?.seriesId
+
+        bookService.deleteSeriesById(series1Id!!)
+        val afterDelete = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(1, afterDelete.series?.size)
+        Assertions.assertEquals("series2", afterDelete.series?.get(0)?.name)
+        Assertions.assertEquals(1.0, afterDelete.series?.get(0)?.numberInSeries)
+
+        Assertions.assertThrows(EntityNotFoundException::class.java) {
+            bookService.findSeriesById(series1Id)
+        }
+        entitiesIds = luceneHelper.searchEntitiesIds("series:(series 1)", LuceneEntity.Book)
+        Assertions.assertEquals(0, entitiesIds?.size)
+    }
+
+    @Test
+    fun testUpdateSeriesRebuildsIndex() {
+        val saved = bookService.saveSeries(SeriesUpdateDto("series1"))
+        Assertions.assertEquals("series1", saved.name)
+        Assertions.assertNotNull(saved.id)
+        val s1 = SeriesOrderDto(name = "series1", numberInSeries = 1.0)
+        val s2 = SeriesOrderDto(name = "series2", numberInSeries = 1.0)
+        val res: BookDto = bookService.save(
+            BookCreateDto(
+                id = null,
+                title = "title1",
+                isbn10 = "",
+                isbn13 = "",
+                summary = "",
+                image = "",
+                publisher = "",
+                pageCount = 50,
+                publishedDate = "",
+                // seriesBak = "",
+                authors = emptyList(),
+                // numberInSeries = null,
+                tags = emptyList(),
+                goodreadsId = "",
+                googleId = "",
+                librarythingId = "",
+                language = "",
+                amazonId = "",
+                series = listOf(s1, s2),
+            ),
+            null,
+        )
+        Assertions.assertNotNull(res.id)
+        val found = bookService.findBookById(res.id!!)
+        Assertions.assertEquals(found.id, res.id)
+        Assertions.assertEquals(found.authors, res.authors)
+        Assertions.assertEquals(found.title, res.title)
+        Assertions.assertEquals(found.isbn10, res.isbn10)
+        Assertions.assertEquals(found.pageCount, res.pageCount)
+        Assertions.assertEquals(0, File(jeluProperties.files.images).listFiles().size)
+        Assertions.assertEquals(2, res.series?.size)
+        val names = listOf(s1.name, s2.name)
+        res.series?.forEach {
+            Assertions.assertEquals(1.0, it.numberInSeries)
+            Assertions.assertTrue(names.contains(it.name))
+        }
+        var entitiesIds = luceneHelper.searchEntitiesIds("tit", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+        entitiesIds = luceneHelper.searchEntitiesIds("series:ser", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series1", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+
+        val updateSeries = bookService.updateSeries(saved.id!!, SeriesUpdateDto(name = "series3"))
+        Assertions.assertEquals("series3", updateSeries.name)
+
+        val search = bookService.findSeriesById(saved.id!!)
+        Assertions.assertEquals("series3", search.name)
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series1", LuceneEntity.Book)
+        Assertions.assertEquals(0, entitiesIds?.size)
+
+        entitiesIds = luceneHelper.searchEntitiesIds("series:series3", LuceneEntity.Book)
+        Assertions.assertEquals(1, entitiesIds?.size)
+        Assertions.assertEquals(res.id, UUID.fromString(entitiesIds?.get(0)))
+    }
+
     @Test
     fun testInsertBooks() {
         val res: BookDto = bookService.save(
@@ -159,9 +947,9 @@ class BookServiceTest(
                 publisher = "",
                 pageCount = 50,
                 publishedDate = "",
-                series = "",
+                // seriesBak = "",
                 authors = emptyList(),
-                numberInSeries = null,
+                // numberInSeries = null,
                 tags = emptyList(),
                 goodreadsId = "",
                 googleId = "",
@@ -223,10 +1011,10 @@ class BookServiceTest(
             publisher = "test-publisher",
             pageCount = 50,
             publishedDate = "",
-            series = "",
+            // seriesBak = "",
             authors = mutableListOf(authorDto()),
             translators = mutableListOf(authorDto()),
-            numberInSeries = null,
+            // numberInSeries = null,
             tags = emptyList(),
             goodreadsId = "4321abc",
             googleId = "1234",
@@ -313,10 +1101,10 @@ class BookServiceTest(
             publisher = "test-publisher",
             pageCount = 50,
             publishedDate = "",
-            series = "",
+            // seriesBak = "",
             authors = mutableListOf(authorDto()),
             translators = mutableListOf(authorDto()),
-            numberInSeries = null,
+            // numberInSeries = null,
             tags = emptyList(),
             goodreadsId = "4321abc",
             googleId = "1234",
@@ -1178,10 +1966,10 @@ class BookServiceTest(
             publisher = "test-publisher",
             pageCount = 50,
             publishedDate = "",
-            series = "",
+            // seriesBak = "",
             authors = mutableListOf(authorDto1),
             translators = mutableListOf(authorDto2),
-            numberInSeries = null,
+            // numberInSeries = null,
             tags = tags(),
             goodreadsId = "4321abc",
             googleId = "1234",
@@ -1199,9 +1987,9 @@ class BookServiceTest(
             publisher = "test-publisher",
             pageCount = 50,
             publishedDate = "",
-            series = "",
+            // seriesBak = "",
             authors = mutableListOf(authorDto2),
-            numberInSeries = null,
+            // numberInSeries = null,
             tags = tags(),
             goodreadsId = "4321abc",
             googleId = "1234",
@@ -1219,9 +2007,9 @@ class BookServiceTest(
             publisher = "test-publisher",
             pageCount = 50,
             publishedDate = "",
-            series = "",
+            // seriesBak = "",
             authors = mutableListOf(authorDto2, authorDto1),
-            numberInSeries = null,
+            // numberInSeries = null,
             tags = tags(),
             goodreadsId = "4321abc",
             googleId = "1234",
diff --git a/src/test/kotlin/io/github/bayang/jelu/service/LifeCycleServiceTest.kt b/src/test/kotlin/io/github/bayang/jelu/service/LifeCycleServiceTest.kt
new file mode 100644
index 00000000..76faee9a
--- /dev/null
+++ b/src/test/kotlin/io/github/bayang/jelu/service/LifeCycleServiceTest.kt
@@ -0,0 +1,26 @@
+package io.github.bayang.jelu.service
+
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class LifeCycleServiceTest(
+    @Autowired private val lifeCycleService: LifeCycleService,
+) {
+
+    @Test
+    fun testGetLifeCycle() {
+        var lifeCycle = lifeCycleService.getLifeCycle()
+        Assertions.assertNotNull(lifeCycle)
+        Assertions.assertEquals(1000, lifeCycle.id)
+        Assertions.assertTrue(lifeCycle.seriesMigrated)
+
+        lifeCycle = lifeCycleService.setSeriesMigrated()
+        Assertions.assertEquals(1000, lifeCycle.id)
+        Assertions.assertTrue(lifeCycle.seriesMigrated)
+    }
+}
diff --git a/src/test/kotlin/io/github/bayang/jelu/service/exports/CsvExportServiceTest.kt b/src/test/kotlin/io/github/bayang/jelu/service/exports/CsvExportServiceTest.kt
index d010ed5a..a01c518b 100644
--- a/src/test/kotlin/io/github/bayang/jelu/service/exports/CsvExportServiceTest.kt
+++ b/src/test/kotlin/io/github/bayang/jelu/service/exports/CsvExportServiceTest.kt
@@ -89,9 +89,9 @@ class CsvExportServiceTest(
             publisher = "test-publisher",
             pageCount = 50,
             publishedDate = "",
-            series = "",
+            // seriesBak = "",
             authors = mutableListOf(authorDto(), authorDto("author2 name")),
-            numberInSeries = null,
+            // numberInSeries = null,
             tags = tags(),
             goodreadsId = "4321abc",
             googleId = "1234",
@@ -121,9 +121,9 @@ class CsvExportServiceTest(
             publisher = "test-publisher",
             pageCount = 50,
             publishedDate = "",
-            series = "",
+            // seriesBak = "",
             authors = mutableListOf(authorDto()),
-            numberInSeries = null,
+            // numberInSeries = null,
             tags = emptyList(),
             goodreadsId = "4321abc",
             googleId = "1234",