diff --git a/source/demyo-vue-frontend/src/composables/model-index.js b/source/demyo-vue-frontend/src/composables/model-index.js
deleted file mode 100644
index dddf2aee..00000000
--- a/source/demyo-vue-frontend/src/composables/model-index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useUiStore } from '@/stores/ui'
-import { useHead } from '@unhead/vue'
-import { useI18n } from 'vue-i18n'
-
-/**
- * Composable for simple model indexes loading data from the service.
- * @param {AbstractModelService} serviceInstance The service to use to fetch the data.
- * @param {string} titleKey the page title key
- */
-export function useSimpleIndex(serviceInstance, titleKey) {
-	useHead({
-		title: useI18n().t(titleKey)
-	})
-
-	const uiStore = useUiStore()
-
-	const modelList = ref([])
-
-	async function fetchData() {
-		uiStore.enableGlobalOverlay()
-		modelList.value = await serviceInstance.findForIndex()
-		uiStore.disableGlobalOverlay()
-	}
-
-	fetchData()
-
-	return { modelList }
-}
diff --git a/source/demyo-vue-frontend/src/composables/model-index.ts b/source/demyo-vue-frontend/src/composables/model-index.ts
new file mode 100644
index 00000000..7d43d76f
--- /dev/null
+++ b/source/demyo-vue-frontend/src/composables/model-index.ts
@@ -0,0 +1,36 @@
+import AbstractModelService from '@/services/abstract-model-service'
+import { useUiStore } from '@/stores/ui'
+import { useHead } from '@unhead/vue'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+/**
+ * Composable for simple model indexes loading data from the service.
+ * @param serviceInstance The service to use to fetch the data.
+ * @param titleKey the page title key
+ */
+export function useSimpleIndex<T extends IModel>(serviceInstance: AbstractModelService, titleKey: string,
+	fetchData: (() => Promise<T[]>) | null = null) {
+	//
+	let safeFetchData: () => Promise<T[]>
+	safeFetchData = fetchData || (() => serviceInstance.findForIndex())
+
+	useHead({
+		title: useI18n().t(titleKey)
+	})
+
+	const uiStore = useUiStore()
+	const loading = computed(() => uiStore.globalOverlay)
+
+	const modelList = ref([] as T[])
+
+	async function loadData() {
+		uiStore.enableGlobalOverlay()
+		modelList.value = await safeFetchData()
+		uiStore.disableGlobalOverlay()
+	}
+
+	loadData()
+
+	return { loading, modelList }
+}
diff --git a/source/demyo-vue-frontend/src/composables/pagination.ts b/source/demyo-vue-frontend/src/composables/pagination.ts
index b741f808..1484a8bc 100644
--- a/source/demyo-vue-frontend/src/composables/pagination.ts
+++ b/source/demyo-vue-frontend/src/composables/pagination.ts
@@ -3,7 +3,7 @@
  */
 
 import { useReaderStore } from '@/stores/reader'
-import { Dictionary } from 'lodash'
+import type { Dictionary } from 'lodash'
 import deburr from 'lodash/deburr'
 import groupBy from 'lodash/groupBy'
 
@@ -19,7 +19,7 @@ function extractFirstLetter<T extends AbstractModel>(item: T, firstLetterExtract
 
 export const emitTypes = ['page-change']
 
-interface PaginationState<T> {
+interface PaginationState<T extends AbstractModel> {
 	/** The current page number. */
 	currentPage: Ref<number>
 	/** The total page count. */
diff --git a/source/demyo-vue-frontend/src/pages/albums/AlbumIndex.vue b/source/demyo-vue-frontend/src/pages/albums/AlbumIndex.vue
index c386686d..fafeaab8 100644
--- a/source/demyo-vue-frontend/src/pages/albums/AlbumIndex.vue
+++ b/source/demyo-vue-frontend/src/pages/albums/AlbumIndex.vue
@@ -1,33 +1,22 @@
 <template>
 	<div class="c-AlbumIndex">
 		<MetaSeriesIndex :items="albums" @page-change="scrollToTop" />
-		<Fab to="/albums/new" icon="mdi-plus" />
+		<Fab v-if="!loading" to="/albums/new" icon="mdi-plus" />
 	</div>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { useSimpleIndex } from '@/composables/model-index'
 import { retrieveFilter } from '@/helpers/filter'
 import albumService from '@/services/album-service'
-import { useUiStore } from '@/stores/ui'
-import { useHead } from '@unhead/vue'
-import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
 
-useHead({
-	title: useI18n().t('title.index.album')
-})
-
-const uiStore = useUiStore()
 const route = useRoute()
 
-const albums = ref([])
-
-async function fetchData() {
-	uiStore.enableGlobalOverlay()
+function fetchData() {
 	const filter = retrieveFilter(route)
-	albums.value = await albumService.findForIndex(filter)
-	uiStore.disableGlobalOverlay()
+	return albumService.findForIndex(filter)
 }
 
-void fetchData()
+const { loading, modelList: albums } = useSimpleIndex(albumService, 'title.index.album', fetchData)
 </script>
diff --git a/source/demyo-vue-frontend/src/pages/tags/TagIndex.vue b/source/demyo-vue-frontend/src/pages/tags/TagIndex.vue
index c473bb6f..f230e2b7 100644
--- a/source/demyo-vue-frontend/src/pages/tags/TagIndex.vue
+++ b/source/demyo-vue-frontend/src/pages/tags/TagIndex.vue
@@ -5,61 +5,38 @@
 				<TagLink :model="tags" />
 			</SectionCard>
 		</v-container>
-		<Fab to="/tags/new" icon="mdi-plus" />
+		<Fab v-if="!loading" to="/tags/new" icon="mdi-plus" />
 	</div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { useSimpleIndex } from '@/composables/model-index'
 import tagService from '@/services/tag-service'
-import { useUiStore } from '@/stores/ui'
 
-export default {
-	name: 'TagIndex',
-
-	data() {
-		return {
-			tags: []
-		}
-	},
-
-	head() {
-		return {
-			title: this.$t('title.index.tag')
-		}
-	},
-
-	computed: {
-		maxUsageCount() {
-			if (this.tags.length === 0) {
-				return 0
-			}
-
-			const max = Math.max.apply(Math, this.tags.map(t => t.usageCount))
-			// Have a reasonable minimum else it just looks silly if there are few tags and they are seldom used
-			return Math.max(max, 10)
-		}
-	},
-
-	created() {
-		this.fetchData()
-	},
+function getMaxUsageCount(tags: Tag[]) {
+	if (tags.length === 0) {
+		return 0
+	}
 
-	methods: {
-		async fetchData() {
-			const uiStore = useUiStore()
-			uiStore.enableGlobalOverlay()
-			this.tags = await tagService.findForIndex()
+	const max = Math.max.apply(Math, tags.map(t => t.usageCount))
+	// Have a reasonable minimum else it just looks silly if there are few tags and they are seldom used
+	return Math.max(max, 10)
+}
 
-			// Post-process tags: compute the relative weight in %
-			// (the base is 100% and the max is 200%, which is very convenient for the font-size)
-			for (const tag of this.tags) {
-				tag.relativeWeight = Math.round(100 * tag.usageCount / this.maxUsageCount + 100)
-			}
+async function fetchData(): Promise<ProcessedTag[]> {
+	const loadedTags: ProcessedTag[] = await tagService.findForIndex()
 
-			uiStore.disableGlobalOverlay()
-		}
+	// Post-process tags: compute the relative weight in %
+	// (the base is 100% and the max is 200%, which is very convenient for the font-size)
+	const maxUsageCount = getMaxUsageCount(loadedTags)
+	for (const tag of loadedTags) {
+		tag.relativeWeight = Math.round(100 * tag.usageCount / maxUsageCount + 100)
 	}
+
+	return Promise.resolve(loadedTags)
 }
+
+const { loading, modelList: tags } = useSimpleIndex(tagService, 'title.index.tag', fetchData)
 </script>
 
 <style lang="scss">