diff --git a/front/src/components/audio/ChannelForm.vue b/front/src/components/audio/ChannelForm.vue
index 7c09b32aa..79f95e535 100644
--- a/front/src/components/audio/ChannelForm.vue
+++ b/front/src/components/audio/ChannelForm.vue
@@ -47,7 +47,8 @@ const newValues = reactive({
 })
 
 const tagList = computed(() => ({
-  custom: newValues.tags
+  currents: newValues.tags.map(tag => ({ type: 'custom' as const, label: tag })),
+  others: [].map(tag => ({ type: 'custom' as const, label: tag }))
 }))
 
 const creating = computed(() => props.object === null)
diff --git a/front/src/components/library/Albums.vue b/front/src/components/library/Albums.vue
index 33a0bfa68..91848eb9d 100644
--- a/front/src/components/library/Albums.vue
+++ b/front/src/components/library/Albums.vue
@@ -50,8 +50,8 @@ const page = usePage()
 const tags = useRouteQuery<string[]>('tag', [])
 
 const tagList = ref({
-  current: [],
-  others: tags.value
+  currents: [].map(tag => ({ type: 'custom' as const, label: tag })),
+  others: tags.value.map(tag => ({ type: 'custom' as const, label: tag }))
 })
 
 const q = useRouteQuery('query', '')
diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue
index 43825c5dc..d4cc471fa 100644
--- a/front/src/components/library/Artists.vue
+++ b/front/src/components/library/Artists.vue
@@ -49,8 +49,8 @@ const page = usePage()
 const tags = useRouteQuery<string[]>('tag', [])
 
 const tagList = computed(() => ({
-  current: [],
-  others: tags.value
+  currents: [].map(tag => ({ type: 'custom' as const, label: tag })),
+  others: tags.value.map(tag => ({ type: 'custom' as const, label: tag }))
 }))
 
 const q = useRouteQuery('query', '')
diff --git a/front/src/components/library/Podcasts.vue b/front/src/components/library/Podcasts.vue
index 2108e6f89..42ea2c5b4 100644
--- a/front/src/components/library/Podcasts.vue
+++ b/front/src/components/library/Podcasts.vue
@@ -51,8 +51,8 @@ const page = usePage()
 const tags = useRouteQuery<string[]>('tag', [])
 
 const tagList = computed(() => ({
-  current: [],
-  others: tags.value
+  current: [].map(tag => ({ type: 'custom' as const, label: tag })),
+  others: tags.value.map(tag => ({ type: 'custom' as const, label: tag }))
 }))
 
 const q = useRouteQuery('query', '')
diff --git a/front/src/views/channels/List.vue b/front/src/views/channels/List.vue
index b1c11f7e3..fa2e6d022 100644
--- a/front/src/views/channels/List.vue
+++ b/front/src/views/channels/List.vue
@@ -78,8 +78,8 @@ const createForm = ref()
 const page = usePage()
 const tags = useRouteQuery<string[]>('tag', [])
 const tagList = computed(() => ({
-  current: [],
-  others: tags.value
+  currents: [].map(tag => ({ type: 'custom' as const, label: tag })),
+  others: tags.value.map(tag => ({ type: 'custom' as const, label: tag }))
 }))
 
 const { onOrderingUpdate, orderingString, paginateBy, ordering, orderingDirection } = useOrdering(props)