From 5a1f7d8170a97be819fd9857f8bf9932f696b480 Mon Sep 17 00:00:00 2001
From: Michael Manganiello <adamantike@users.noreply.github.com>
Date: Tue, 9 Sep 2025 00:19:03 -0300
Subject: [PATCH 01/73] feat: Initial support for multi-value ROM filters

This change converts the existing single-value ROM filter parameters
to support multiple values. Users can now filter ROMs by multiple genres,
franchises, collections, companies, age ratings, regions, and languages by
repeating the respective query parameters in API requests.

At the moment, setting multiple values for a filter will return ROMs
that match any of the provided values (logical OR). A future change can
introduce parameters like `genres_all (boolean)` to allow filtering ROMs
that match all specified values (logical AND).

The frontend has been updated to send single-value filters as arrays
to maintain compatibility with existing UI components. At the moment,
the UI does not support selecting multiple values, but this change
lays the groundwork for it.

NOTE: Breaking API change, as the filter parameters have changed names.
---
 backend/endpoints/rom.py                      | 105 ++++++++---
 .../handler/database/collections_handler.py   |  45 ++++-
 backend/handler/database/roms_handler.py      | 177 +++++++++++-------
 .../Dialog/CreateSmartCollection.vue          |  16 +-
 frontend/src/services/api/rom.ts              |  14 +-
 5 files changed, 234 insertions(+), 123 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 0c6e31cf4..f51caf94a 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -226,37 +226,86 @@ def get_roms(
             description="Whether to group roms by metadata ID (IGDB / Moby / ScreenScraper / RetroAchievements / LaunchBox)."
         ),
     ] = False,
-    selected_genre: Annotated[
-        str | None,
-        Query(description="Associated genre."),
+    genres: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Associated genre. Multiple values are allowed by repeating the"
+                " parameter, and results that match any of the values will be"
+                " returned."
+            ),
+            alias="genre",
+        ),
     ] = None,
-    selected_franchise: Annotated[
-        str | None,
-        Query(description="Associated franchise."),
+    franchises: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Associated franchise. Multiple values are allowed by repeating"
+                " the parameter, and results that match any of the values will"
+                " be returned."
+            ),
+            alias="franchise",
+        ),
     ] = None,
-    selected_collection: Annotated[
-        str | None,
-        Query(description="Associated collection."),
+    collections: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Associated collection. Multiple values are allowed by"
+                " repeating the parameter, and results that match any of the"
+                " values will be returned."
+            ),
+            alias="collection",
+        ),
     ] = None,
-    selected_company: Annotated[
-        str | None,
-        Query(description="Associated company."),
+    companies: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Associated company. Multiple values are allowed by repeating"
+                " the parameter, and results that match any of the values will"
+                " be returned."
+            ),
+            alias="company",
+        ),
     ] = None,
-    selected_age_rating: Annotated[
-        str | None,
-        Query(description="Associated age rating."),
+    age_ratings: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Associated age rating. Multiple values are allowed by"
+                " repeating the parameter, and results that match any of the"
+                " values will be returned."
+            ),
+            alias="age_rating",
+        ),
     ] = None,
     selected_status: Annotated[
         str | None,
         Query(description="Game status, set by the current user."),
     ] = None,
-    selected_region: Annotated[
-        str | None,
-        Query(description="Associated region tag."),
+    regions: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Associated region tag. Multiple values are allowed by"
+                " repeating the parameter, and results that match any of the"
+                " values will be returned."
+            ),
+            alias="region",
+        ),
     ] = None,
-    selected_language: Annotated[
-        str | None,
-        Query(description="Associated language tag."),
+    languages: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Associated language tag. Multiple values are allowed by"
+                " repeating the parameter, and results that match any of the"
+                " values will be returned."
+            ),
+            alias="language",
+        ),
     ] = None,
     order_by: Annotated[
         str,
@@ -292,14 +341,14 @@ def get_roms(
         has_ra=has_ra,
         missing=missing,
         verified=verified,
-        selected_genre=selected_genre,
-        selected_franchise=selected_franchise,
-        selected_collection=selected_collection,
-        selected_company=selected_company,
-        selected_age_rating=selected_age_rating,
+        genres=genres,
+        franchises=franchises,
+        collections=collections,
+        companies=companies,
+        age_ratings=age_ratings,
         selected_status=selected_status,
-        selected_region=selected_region,
-        selected_language=selected_language,
+        regions=regions,
+        languages=languages,
         group_by_meta_id=group_by_meta_id,
     )
 
diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
index 6c9264808..1c22ab4a6 100644
--- a/backend/handler/database/collections_handler.py
+++ b/backend/handler/database/collections_handler.py
@@ -204,6 +204,37 @@ class DBCollectionsHandler(DBBaseHandler):
         # Extract filter criteria
         criteria = smart_collection.filter_criteria
 
+        # Backwards compatibility with old criteria names
+        genres = criteria.get("genres") or (
+            [criteria["selected_genre"]] if criteria.get("selected_genre") else None
+        )
+        franchises = criteria.get("franchises") or (
+            [criteria["selected_franchise"]]
+            if criteria.get("selected_franchise")
+            else None
+        )
+        collections = criteria.get("collections") or (
+            [criteria["selected_collection"]]
+            if criteria.get("selected_collection")
+            else None
+        )
+        companies = criteria.get("companies") or (
+            [criteria["selected_company"]] if criteria.get("selected_company") else None
+        )
+        age_ratings = criteria.get("age_ratings") or (
+            [criteria["selected_age_rating"]]
+            if criteria.get("selected_age_rating")
+            else None
+        )
+        regions = criteria.get("regions") or (
+            [criteria["selected_region"]] if criteria.get("selected_region") else None
+        )
+        languages = criteria.get("languages") or (
+            [criteria["selected_language"]]
+            if criteria.get("selected_language")
+            else None
+        )
+
         # Use the existing filter_roms method with the stored criteria
         return db_rom_handler.get_roms_scalar(
             platform_id=criteria.get("platform_id"),
@@ -217,14 +248,14 @@ class DBCollectionsHandler(DBBaseHandler):
             has_ra=criteria.get("has_ra"),
             missing=criteria.get("missing"),
             verified=criteria.get("verified"),
-            selected_genre=criteria.get("selected_genre"),
-            selected_franchise=criteria.get("selected_franchise"),
-            selected_collection=criteria.get("selected_collection"),
-            selected_company=criteria.get("selected_company"),
-            selected_age_rating=criteria.get("selected_age_rating"),
+            genres=genres,
+            franchises=franchises,
+            collections=collections,
+            companies=companies,
+            age_ratings=age_ratings,
             selected_status=criteria.get("selected_status"),
-            selected_region=criteria.get("selected_region"),
-            selected_language=criteria.get("selected_language"),
+            regions=regions,
+            languages=languages,
             user_id=user_id,
             order_by=criteria.get("order_by", "name"),
             order_dir=criteria.get("order_dir", "asc"),
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index ee85dd738..21c1ed807 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -29,7 +29,10 @@ from handler.metadata.base_hander import UniversalPlatformSlug as UPS
 from models.assets import Save, Screenshot, State
 from models.platform import Platform
 from models.rom import Rom, RomFile, RomMetadata, RomUser
-from utils.database import json_array_contains_value
+from utils.database import (
+    json_array_contains_all,
+    json_array_contains_any,
+)
 
 from .base_handler import DBBaseHandler
 
@@ -306,30 +309,60 @@ class DBRomsHandler(DBBaseHandler):
                 or_(*(Rom.hasheous_metadata[key].as_boolean() for key in keys_to_check))
             )
 
-    def filter_by_genre(self, query: Query, session: Session, value: str) -> Query:
-        return query.filter(
-            json_array_contains_value(RomMetadata.genres, value, session=session)
-        )
+    def filter_by_genres(
+        self,
+        query: Query,
+        *,
+        session: Session,
+        values: Sequence[str],
+        match_all: bool = False,
+    ) -> Query:
+        op = json_array_contains_all if match_all else json_array_contains_any
+        return query.filter(op(RomMetadata.genres, values, session=session))
 
-    def filter_by_franchise(self, query: Query, session: Session, value: str) -> Query:
-        return query.filter(
-            json_array_contains_value(RomMetadata.franchises, value, session=session)
-        )
+    def filter_by_franchises(
+        self,
+        query: Query,
+        *,
+        session: Session,
+        values: Sequence[str],
+        match_all: bool = False,
+    ) -> Query:
+        op = json_array_contains_all if match_all else json_array_contains_any
+        return query.filter(op(RomMetadata.franchises, values, session=session))
 
-    def filter_by_collection(self, query: Query, session: Session, value: str) -> Query:
-        return query.filter(
-            json_array_contains_value(RomMetadata.collections, value, session=session)
-        )
+    def filter_by_collections(
+        self,
+        query: Query,
+        *,
+        session: Session,
+        values: Sequence[str],
+        match_all: bool = False,
+    ) -> Query:
+        op = json_array_contains_all if match_all else json_array_contains_any
+        return query.filter(op(RomMetadata.collections, values, session=session))
 
-    def filter_by_company(self, query: Query, session: Session, value: str) -> Query:
-        return query.filter(
-            json_array_contains_value(RomMetadata.companies, value, session=session)
-        )
+    def filter_by_companies(
+        self,
+        query: Query,
+        *,
+        session: Session,
+        values: Sequence[str],
+        match_all: bool = False,
+    ) -> Query:
+        op = json_array_contains_all if match_all else json_array_contains_any
+        return query.filter(op(RomMetadata.companies, values, session=session))
 
-    def filter_by_age_rating(self, query: Query, session: Session, value: str) -> Query:
-        return query.filter(
-            json_array_contains_value(RomMetadata.age_ratings, value, session=session)
-        )
+    def filter_by_age_ratings(
+        self,
+        query: Query,
+        *,
+        session: Session,
+        values: Sequence[str],
+        match_all: bool = False,
+    ) -> Query:
+        op = json_array_contains_all if match_all else json_array_contains_any
+        return query.filter(op(RomMetadata.age_ratings, values, session=session))
 
     def filter_by_status(self, query: Query, selected_status: str):
         status_filter = RomUser.status == selected_status
@@ -345,15 +378,27 @@ class DBRomsHandler(DBBaseHandler):
 
         return query.filter(status_filter, RomUser.hidden.is_(False))
 
-    def filter_by_region(self, query: Query, session: Session, value: str) -> Query:
-        return query.filter(
-            json_array_contains_value(Rom.regions, value, session=session)
-        )
+    def filter_by_regions(
+        self,
+        query: Query,
+        *,
+        session: Session,
+        values: Sequence[str],
+        match_all: bool = False,
+    ) -> Query:
+        op = json_array_contains_all if match_all else json_array_contains_any
+        return query.filter(op(Rom.regions, values, session=session))
 
-    def filter_by_language(self, query: Query, session: Session, value: str) -> Query:
-        return query.filter(
-            json_array_contains_value(Rom.languages, value, session=session)
-        )
+    def filter_by_languages(
+        self,
+        query: Query,
+        *,
+        session: Session,
+        values: Sequence[str],
+        match_all: bool = False,
+    ) -> Query:
+        op = json_array_contains_all if match_all else json_array_contains_any
+        return query.filter(op(Rom.languages, values, session=session))
 
     @begin_session
     def filter_roms(
@@ -372,14 +417,14 @@ class DBRomsHandler(DBBaseHandler):
         missing: bool | None = None,
         verified: bool | None = None,
         group_by_meta_id: bool = False,
-        selected_genre: str | None = None,
-        selected_franchise: str | None = None,
-        selected_collection: str | None = None,
-        selected_company: str | None = None,
-        selected_age_rating: str | None = None,
+        genres: Sequence[str] | None = None,
+        franchises: Sequence[str] | None = None,
+        collections: Sequence[str] | None = None,
+        companies: Sequence[str] | None = None,
+        age_ratings: Sequence[str] | None = None,
         selected_status: str | None = None,
-        selected_region: str | None = None,
-        selected_language: str | None = None,
+        regions: Sequence[str] | None = None,
+        languages: Sequence[str] | None = None,
         user_id: int | None = None,
         session: Session = None,
     ) -> Query[Rom]:
@@ -519,39 +564,27 @@ class DBRomsHandler(DBBaseHandler):
                 )
             )
 
-        if (
-            selected_genre
-            or selected_franchise
-            or selected_collection
-            or selected_company
-            or selected_age_rating
-        ):
+        if genres or franchises or collections or companies or age_ratings:
             query = query.outerjoin(RomMetadata)
 
-        if selected_genre:
-            query = self.filter_by_genre(query, session=session, value=selected_genre)
-        if selected_franchise:
-            query = self.filter_by_franchise(
-                query, session=session, value=selected_franchise
+        if genres:
+            query = self.filter_by_genres(query, session=session, values=genres)
+        if franchises:
+            query = self.filter_by_franchises(query, session=session, values=franchises)
+        if collections:
+            query = self.filter_by_collections(
+                query, session=session, values=collections
             )
-        if selected_collection:
-            query = self.filter_by_collection(
-                query, session=session, value=selected_collection
-            )
-        if selected_company:
-            query = self.filter_by_company(
-                query, session=session, value=selected_company
-            )
-        if selected_age_rating:
-            query = self.filter_by_age_rating(
-                query, session=session, value=selected_age_rating
-            )
-        if selected_region:
-            query = self.filter_by_region(query, session=session, value=selected_region)
-        if selected_language:
-            query = self.filter_by_language(
-                query, session=session, value=selected_language
+        if companies:
+            query = self.filter_by_companies(query, session=session, values=companies)
+        if age_ratings:
+            query = self.filter_by_age_ratings(
+                query, session=session, values=age_ratings
             )
+        if regions:
+            query = self.filter_by_regions(query, session=session, values=regions)
+        if languages:
+            query = self.filter_by_languages(query, session=session, values=languages)
 
         # The RomUser table is already joined if user_id is set
         if selected_status and user_id:
@@ -633,14 +666,14 @@ class DBRomsHandler(DBBaseHandler):
             has_ra=kwargs.get("has_ra", None),
             missing=kwargs.get("missing", None),
             verified=kwargs.get("verified", None),
-            selected_genre=kwargs.get("selected_genre", None),
-            selected_franchise=kwargs.get("selected_franchise", None),
-            selected_collection=kwargs.get("selected_collection", None),
-            selected_company=kwargs.get("selected_company", None),
-            selected_age_rating=kwargs.get("selected_age_rating", None),
+            genres=kwargs.get("genres", None),
+            franchises=kwargs.get("franchises", None),
+            collections=kwargs.get("collections", None),
+            companies=kwargs.get("companies", None),
+            age_ratings=kwargs.get("age_ratings", None),
             selected_status=kwargs.get("selected_status", None),
-            selected_region=kwargs.get("selected_region", None),
-            selected_language=kwargs.get("selected_language", None),
+            regions=kwargs.get("regions", None),
+            languages=kwargs.get("languages", None),
             user_id=kwargs.get("user_id", None),
         )
         return session.scalars(roms).all()
diff --git a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
index 64003c512..167ada3a2 100644
--- a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
+++ b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
@@ -123,24 +123,22 @@ async function createSmartCollection() {
     if (filterRA.value) filterCriteria.has_ra = true;
     if (filterMissing.value) filterCriteria.missing = true;
     if (filterVerified.value) filterCriteria.verified = true;
-    if (selectedGenre.value)
-      filterCriteria.selected_genre = selectedGenre.value;
+    if (selectedGenre.value) filterCriteria.genres = [selectedGenre.value];
     if (selectedFranchise.value)
-      filterCriteria.selected_franchise = selectedFranchise.value;
+      filterCriteria.franchises = [selectedFranchise.value];
     if (selectedCollection.value)
-      filterCriteria.selected_collection = selectedCollection.value;
+      filterCriteria.collections = [selectedCollection.value];
     if (selectedCompany.value)
-      filterCriteria.selected_company = selectedCompany.value;
+      filterCriteria.companies = [selectedCompany.value];
     if (selectedAgeRating.value)
-      filterCriteria.selected_age_rating = selectedAgeRating.value;
+      filterCriteria.age_ratings = [selectedAgeRating.value];
     if (selectedStatus.value)
       filterCriteria.selected_status = getStatusKeyForText(
         selectedStatus.value,
       );
-    if (selectedRegion.value)
-      filterCriteria.selected_region = selectedRegion.value;
+    if (selectedRegion.value) filterCriteria.regions = [selectedRegion.value];
     if (selectedLanguage.value)
-      filterCriteria.selected_language = selectedLanguage.value;
+      filterCriteria.languages = [selectedLanguage.value];
 
     const { data } = await collectionApi.createSmartCollection({
       smartCollection: {
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index a86649eb8..14e62efa3 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -130,14 +130,14 @@ async function getRoms({
       order_by: orderBy,
       order_dir: orderDir,
       group_by_meta_id: groupByMetaId,
-      selected_genre: selectedGenre,
-      selected_franchise: selectedFranchise,
-      selected_collection: selectedCollection,
-      selected_company: selectedCompany,
-      selected_age_rating: selectedAgeRating,
+      genre: selectedGenre,
+      franchise: selectedFranchise,
+      collection: selectedCollection,
+      company: selectedCompany,
+      age_rating: selectedAgeRating,
       selected_status: getStatusKeyForText(selectedStatus),
-      selected_region: selectedRegion,
-      selected_language: selectedLanguage,
+      region: selectedRegion,
+      language: selectedLanguage,
       ...(filterUnmatched ? { matched: false } : {}),
       ...(filterMatched ? { matched: true } : {}),
       ...(filterFavourites ? { favourite: true } : {}),

From 91e3dfb1bbe735e0694b94b27aa4c67bfc7f3637 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 21 Nov 2025 14:20:10 +0000
Subject: [PATCH 02/73] feat: add RomNote import to roms_handler for enhanced
 functionality

---
 backend/handler/database/roms_handler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index dfd3c2017..2e7b892c8 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -28,11 +28,11 @@ from decorators.database import begin_session
 from handler.metadata.base_handler import UniversalPlatformSlug as UPS
 from models.assets import Save, Screenshot, State
 from models.platform import Platform
-from models.rom import Rom, RomFile, RomMetadata, RomUser
+from models.rom import Rom, RomFile, RomMetadata, RomNote, RomUser
 from utils.database import (
     json_array_contains_all,
     json_array_contains_any,
-    json_array_contains_value
+    json_array_contains_value,
 )
 
 from .base_handler import DBBaseHandler

From c6717ee6356ae78de191874d2c059271339da2ed Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 12:56:01 +0000
Subject: [PATCH 03/73] Refactor gallery filter components to use toggle
 buttons for filter states, allowing null values for all filters. Update
 filter logic in the store and API services to accommodate new states. Enhance
 UI for better visibility and interaction with filter options in the gallery
 app.

---
 backend/endpoints/rom.py                      |  59 +++++-
 .../handler/database/collections_handler.py   |  47 ++---
 backend/handler/database/roms_handler.py      |  10 +-
 backend/utils/database.py                     |  10 +-
 .../components/Details/MultiNoteManager.vue   |  28 ++-
 .../AppBar/common/FilterDrawer/Base.vue       |  11 +-
 .../FilterDrawer/FilterDuplicatesBtn.vue      |  91 +++++++--
 .../FilterDrawer/FilterFavoritesBtn.vue       |  74 +++++--
 .../FilterDrawer/FilterMatchStateBtn.vue      |  86 ++++++++
 .../common/FilterDrawer/FilterMatchedBtn.vue  |  35 ----
 .../common/FilterDrawer/FilterMissingBtn.vue  |  75 +++++--
 .../FilterDrawer/FilterPlayablesBtn.vue       |  88 +++++++--
 .../common/FilterDrawer/FilterRaBtn.vue       |  89 +++++++--
 .../FilterDrawer/FilterUnmatchedBtn.vue       |  36 ----
 .../common/FilterDrawer/FilterVerifiedBtn.vue |  75 +++++--
 .../Dialog/CreateSmartCollection.vue          |  23 ++-
 frontend/src/services/api/rom.ts              |  24 +--
 frontend/src/services/cache/api.ts            |  22 ++-
 frontend/src/stores/galleryFilter.ts          | 184 ++++++++++++++----
 19 files changed, 777 insertions(+), 290 deletions(-)
 create mode 100644 frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
 delete mode 100644 frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchedBtn.vue
 delete mode 100644 frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 1a9218d8b..0ff26dfee 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -1,5 +1,6 @@
 import binascii
 import json
+import logging
 from base64 import b64encode
 from datetime import datetime, timezone
 from io import BytesIO
@@ -258,9 +259,10 @@ def get_roms(
             description=(
                 "Associated genre. Multiple values are allowed by repeating the"
                 " parameter, and results that match any of the values will be"
-                " returned."
+                " returned. Maximum 50 values allowed."
             ),
             alias="genre",
+            max_length=50,
         ),
     ] = None,
     franchises: Annotated[
@@ -269,9 +271,10 @@ def get_roms(
             description=(
                 "Associated franchise. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will"
-                " be returned."
+                " be returned. Maximum 50 values allowed."
             ),
             alias="franchise",
+            max_length=50,
         ),
     ] = None,
     collections: Annotated[
@@ -280,9 +283,10 @@ def get_roms(
             description=(
                 "Associated collection. Multiple values are allowed by"
                 " repeating the parameter, and results that match any of the"
-                " values will be returned."
+                " values will be returned. Maximum 50 values allowed."
             ),
             alias="collection",
+            max_length=50,
         ),
     ] = None,
     companies: Annotated[
@@ -291,9 +295,10 @@ def get_roms(
             description=(
                 "Associated company. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will"
-                " be returned."
+                " be returned. Maximum 50 values allowed."
             ),
             alias="company",
+            max_length=50,
         ),
     ] = None,
     age_ratings: Annotated[
@@ -302,9 +307,10 @@ def get_roms(
             description=(
                 "Associated age rating. Multiple values are allowed by"
                 " repeating the parameter, and results that match any of the"
-                " values will be returned."
+                " values will be returned. Maximum 20 values allowed."
             ),
             alias="age_rating",
+            max_length=20,
         ),
     ] = None,
     selected_status: Annotated[
@@ -317,9 +323,10 @@ def get_roms(
             description=(
                 "Associated region tag. Multiple values are allowed by"
                 " repeating the parameter, and results that match any of the"
-                " values will be returned."
+                " values will be returned. Maximum 30 values allowed."
             ),
             alias="region",
+            max_length=30,
         ),
     ] = None,
     languages: Annotated[
@@ -328,9 +335,10 @@ def get_roms(
             description=(
                 "Associated language tag. Multiple values are allowed by"
                 " repeating the parameter, and results that match any of the"
-                " values will be returned."
+                " values will be returned. Maximum 30 values allowed."
             ),
             alias="language",
+            max_length=30,
         ),
     ] = None,
     order_by: Annotated[
@@ -344,6 +352,43 @@ def get_roms(
 ) -> CustomLimitOffsetPage[SimpleRomSchema]:
     """Retrieve roms."""
 
+    # Sanitize and validate filter arrays
+    def sanitize_filter_array(
+        values: list[str] | None, max_length: int = 50, filter_name: str = ""
+    ) -> list[str] | None:
+        """Sanitize filter array by removing empty strings and limiting size."""
+        if not values:
+            return None
+
+        try:
+            # Remove empty/whitespace-only values and strip whitespace
+            sanitized = [
+                v.strip() for v in values if v and isinstance(v, str) and v.strip()
+            ]
+            if not sanitized:
+                return None
+
+            # Limit array size to prevent abuse
+            if len(sanitized) > max_length:
+                logging.warning(
+                    f"Filter array '{filter_name}' truncated from {len(sanitized)} to {max_length} items"
+                )
+                sanitized = sanitized[:max_length]
+
+            return sanitized
+        except Exception as e:
+            logging.error(f"Error sanitizing filter array '{filter_name}': {e}")
+            return None
+
+    # Apply sanitization with specific limits and names
+    genres = sanitize_filter_array(genres, 50, "genres")
+    franchises = sanitize_filter_array(franchises, 50, "franchises")
+    collections = sanitize_filter_array(collections, 50, "collections")
+    companies = sanitize_filter_array(companies, 50, "companies")
+    age_ratings = sanitize_filter_array(age_ratings, 20, "age_ratings")
+    regions = sanitize_filter_array(regions, 30, "regions")
+    languages = sanitize_filter_array(languages, 30, "languages")
+
     # Get the base roms query
     query, order_by_attr = db_rom_handler.get_roms_query(
         user_id=request.user.id,
diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
index c5fefe822..974e87279 100644
--- a/backend/handler/database/collections_handler.py
+++ b/backend/handler/database/collections_handler.py
@@ -213,36 +213,23 @@ class DBCollectionsHandler(DBBaseHandler):
         # Extract filter criteria
         criteria = smart_collection.filter_criteria
 
-        # Backwards compatibility with old criteria names
-        genres = criteria.get("genres") or (
-            [criteria["selected_genre"]] if criteria.get("selected_genre") else None
-        )
-        franchises = criteria.get("franchises") or (
-            [criteria["selected_franchise"]]
-            if criteria.get("selected_franchise")
-            else None
-        )
-        collections = criteria.get("collections") or (
-            [criteria["selected_collection"]]
-            if criteria.get("selected_collection")
-            else None
-        )
-        companies = criteria.get("companies") or (
-            [criteria["selected_company"]] if criteria.get("selected_company") else None
-        )
-        age_ratings = criteria.get("age_ratings") or (
-            [criteria["selected_age_rating"]]
-            if criteria.get("selected_age_rating")
-            else None
-        )
-        regions = criteria.get("regions") or (
-            [criteria["selected_region"]] if criteria.get("selected_region") else None
-        )
-        languages = criteria.get("languages") or (
-            [criteria["selected_language"]]
-            if criteria.get("selected_language")
-            else None
-        )
+        # Convert legacy single-value criteria to arrays for backward compatibility
+        def convert_legacy_filter(new_key: str, old_key: str) -> list[str] | None:
+            """Convert legacy single-value filter to array format."""
+            if new_value := criteria.get(new_key):
+                return new_value if isinstance(new_value, list) else [new_value]
+            if old_value := criteria.get(old_key):
+                return [old_value]
+            return None
+
+        # Apply conversions
+        genres = convert_legacy_filter("genres", "selected_genre")
+        franchises = convert_legacy_filter("franchises", "selected_franchise")
+        collections = convert_legacy_filter("collections", "selected_collection")
+        companies = convert_legacy_filter("companies", "selected_company")
+        age_ratings = convert_legacy_filter("age_ratings", "selected_age_rating")
+        regions = convert_legacy_filter("regions", "selected_region")
+        languages = convert_legacy_filter("languages", "selected_language")
 
         # Use the existing filter_roms method with the stored criteria
         return db_rom_handler.get_roms_scalar(
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index f971f147e..cd57f6ec7 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -587,9 +587,15 @@ class DBRomsHandler(DBBaseHandler):
                 )
             )
 
-        if genres or franchises or collections or companies or age_ratings:
+        # Optimize JOINs - only join tables when needed
+        needs_metadata_join = any(
+            [genres, franchises, collections, companies, age_ratings]
+        )
+
+        if needs_metadata_join:
             query = query.outerjoin(RomMetadata)
 
+        # Apply metadata filters efficiently
         if genres:
             query = self.filter_by_genres(query, session=session, values=genres)
         if franchises:
@@ -604,6 +610,8 @@ class DBRomsHandler(DBBaseHandler):
             query = self.filter_by_age_ratings(
                 query, session=session, values=age_ratings
             )
+
+        # Apply rom-level filters
         if regions:
             query = self.filter_by_regions(query, session=session, values=regions)
         if languages:
diff --git a/backend/utils/database.py b/backend/utils/database.py
index d923f8ba8..e1dcfa948 100644
--- a/backend/utils/database.py
+++ b/backend/utils/database.py
@@ -44,7 +44,7 @@ def is_mariadb(conn: sa.Connection, min_version: tuple[int, ...] | None = None)
 
 
 def json_array_contains_value(
-    column: sa.Column, value: str | int, *, session: Session
+    column: sa.Column | Any, value: str | int, *, session: Session
 ) -> ColumnElement:
     """Check if a JSON array column contains the given value."""
     conn = session.get_bind()
@@ -66,12 +66,16 @@ def json_array_contains_value(
 
 
 def json_array_contains_any(
-    column: sa.Column, values: Sequence[str] | Sequence[int], *, session: Session
+    column: sa.Column | Any, values: Sequence[str] | Sequence[int], *, session: Session
 ) -> ColumnElement:
     """Check if a JSON array column contains any of the given values."""
     if not values:
         return sa.false()
 
+    # Optimize for single value case
+    if len(values) == 1:
+        return json_array_contains_value(column, values[0], session=session)
+
     conn = session.get_bind()
     if is_postgresql(conn):
         # In PostgreSQL, string arrays can be checked for overlap using the `?|` operator.
@@ -98,7 +102,7 @@ def json_array_contains_any(
 
 
 def json_array_contains_all(
-    column: sa.Column, values: Sequence[Any], *, session: Session
+    column: sa.Column | Any, values: Sequence[Any], *, session: Session
 ) -> ColumnElement:
     """Check if a JSON array column contains all of the given values."""
     if not values:
diff --git a/frontend/src/components/Details/MultiNoteManager.vue b/frontend/src/components/Details/MultiNoteManager.vue
index a716a7fb1..5263d8fb2 100644
--- a/frontend/src/components/Details/MultiNoteManager.vue
+++ b/frontend/src/components/Details/MultiNoteManager.vue
@@ -499,15 +499,25 @@ watch(
         </div>
       </template>
       <template #footer>
-        <v-spacer />
-        <v-btn @click="closeAddNote">{{ t("common.cancel") }}</v-btn>
-        <v-btn
-          color="primary"
-          :disabled="!newNoteTitle.trim() || newNoteTitleErrors.length > 0"
-          @click="addNewNote"
-        >
-          {{ t("common.add") }}
-        </v-btn>
+        <v-row class="justify-center pa-2" no-gutters>
+          <v-btn-group divided density="compact">
+            <v-btn class="bg-toplayer" @click="closeAddNote">{{
+              t("common.cancel")
+            }}</v-btn>
+            <v-btn
+              class="bg-toplayer text-romm-green"
+              :disabled="!newNoteTitle.trim() || newNoteTitleErrors.length > 0"
+              :variant="
+                !newNoteTitle.trim() || newNoteTitleErrors.length > 0
+                  ? 'plain'
+                  : 'flat'
+              "
+              @click="addNewNote"
+            >
+              {{ t("common.add") }}
+            </v-btn>
+          </v-btn-group>
+        </v-row>
       </template>
     </RDialog>
 
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index f727b7d0c..cd33af854 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -9,11 +9,10 @@ import { useDisplay } from "vuetify";
 import SearchTextField from "@/components/Gallery/AppBar/Search/SearchTextField.vue";
 import FilterDuplicatesBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue";
 import FilterFavoritesBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue";
-import FilterMatchedBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterMatchedBtn.vue";
+import FilterMatchStateBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue";
 import FilterMissingBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue";
 import FilterPlayablesBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue";
 import FilterRaBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue";
-import FilterUnmatchedBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue";
 import FilterVerifiedBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue";
 import MissingFromFSIcon from "@/components/common/MissingFromFSIcon.vue";
 import PlatformIcon from "@/components/common/Platform/PlatformIcon.vue";
@@ -317,7 +316,7 @@ onMounted(async () => {
     v-model="activeFilterDrawer"
     mobile
     floating
-    width="400"
+    width="500"
     :class="{
       'ml-2': activeFilterDrawer,
       'drawer-mobile': smAndDown && activeFilterDrawer,
@@ -331,11 +330,7 @@ onMounted(async () => {
         </v-list-item>
       </template>
       <v-list-item>
-        <FilterUnmatchedBtn :tabindex="activeFilterDrawer ? 0 : -1" />
-        <FilterMatchedBtn
-          class="mt-2"
-          :tabindex="activeFilterDrawer ? 0 : -1"
-        />
+        <FilterMatchStateBtn :tabindex="activeFilterDrawer ? 0 : -1" />
         <FilterFavoritesBtn
           class="mt-2"
           :tabindex="activeFilterDrawer ? 0 : -1"
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
index f2eb8417e..ece15b2dc 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
+import { computed } from "vue";
 import { inject } from "vue";
 import { useI18n } from "vue-i18n";
 import storeGalleryFilter from "@/stores/galleryFilter";
@@ -13,29 +14,81 @@ const galleryFilterStore = storeGalleryFilter();
 const { fetchTotalRoms } = storeToRefs(romsStore);
 const { filterDuplicates } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
-function setDuplicates() {
-  galleryFilterStore.switchFilterDuplicates();
+
+// Computed property to determine current state
+const currentState = computed(() => {
+  if (filterDuplicates.value === true) return "duplicates";
+  if (filterDuplicates.value === false) return "not-duplicates";
+  return "all"; // null
+});
+
+// Handler for state changes
+function setState(state: string | null) {
+  if (!state) return;
+
+  galleryFilterStore.setFilterDuplicatesState(
+    state as "all" | "duplicates" | "not-duplicates",
+  );
   emitter?.emit("filterRoms", null);
 }
 </script>
 
 <template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterDuplicates ? 'primary' : ''"
-    :disabled="fetchTotalRoms > 10000"
-    @click="setDuplicates"
+  <div
+    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
+    :class="{ 'opacity-50': fetchTotalRoms > 10000 }"
   >
-    <v-icon :color="filterDuplicates ? 'primary' : ''">
-      mdi-card-multiple
-    </v-icon>
-    <span
-      class="ml-2"
-      :class="{
-        'text-primary': filterDuplicates,
-      }"
-      >{{ t("platform.show-duplicates") }}
-    </span>
-  </v-btn>
+    <div class="d-flex align-center">
+      <v-icon
+        :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        class="mr-3"
+      >
+        mdi-card-multiple
+      </v-icon>
+      <span
+        :class="
+          currentState !== 'all'
+            ? 'text-primary font-weight-medium'
+            : 'text-medium-emphasis'
+        "
+        class="text-body-1"
+      >
+        {{ t("platform.show-duplicates") }}
+      </span>
+    </div>
+    <v-btn-toggle
+      :model-value="currentState"
+      color="primary"
+      density="compact"
+      variant="outlined"
+      :disabled="fetchTotalRoms > 10000"
+      @update:model-value="setState"
+    >
+      <v-btn value="all" size="small">All</v-btn>
+      <v-tooltip text="Show duplicate ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn
+            value="duplicates"
+            size="small"
+            v-bind="props"
+            :disabled="fetchTotalRoms > 10000"
+          >
+            <v-icon size="x-large">mdi-card-multiple</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+      <v-tooltip text="Show non-duplicate ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn
+            value="not-duplicates"
+            size="small"
+            v-bind="props"
+            :disabled="fetchTotalRoms > 10000"
+          >
+            <v-icon size="x-large">mdi-card-outline</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
 </template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
index 0e505bbd7..1c8f8afc1 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
+import { computed } from "vue";
 import { inject } from "vue";
 import { useI18n } from "vue-i18n";
 import storeGalleryFilter from "@/stores/galleryFilter";
@@ -10,26 +11,69 @@ const { t } = useI18n();
 const galleryFilterStore = storeGalleryFilter();
 const { filterFavorites } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
-function setFavorites() {
-  galleryFilterStore.switchFilterFavorites();
+
+// Computed property to determine current state
+const currentState = computed(() => {
+  if (filterFavorites.value === true) return "favorites";
+  if (filterFavorites.value === false) return "not-favorites";
+  return "all"; // null
+});
+
+// Handler for state changes
+function setState(state: string | null) {
+  if (!state) return;
+
+  galleryFilterStore.setFilterFavoritesState(
+    state as "all" | "favorites" | "not-favorites",
+  );
   emitter?.emit("filterRoms", null);
 }
 </script>
 
 <template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterFavorites ? 'primary' : ''"
-    @click="setFavorites"
+  <div
+    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
   >
-    <v-icon :color="filterFavorites ? 'primary' : ''"> mdi-star </v-icon
-    ><span
-      class="ml-2"
-      :class="{
-        'text-primary': filterFavorites,
-      }"
-      >{{ t("platform.show-favorites") }}</span
+    <div class="d-flex align-center">
+      <v-icon
+        :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        class="mr-3"
+      >
+        mdi-star
+      </v-icon>
+      <span
+        :class="
+          currentState !== 'all'
+            ? 'text-primary font-weight-medium'
+            : 'text-medium-emphasis'
+        "
+        class="text-body-1"
+      >
+        {{ t("platform.show-favorites") }}
+      </span>
+    </div>
+    <v-btn-toggle
+      :model-value="currentState"
+      color="primary"
+      density="compact"
+      variant="outlined"
+      @update:model-value="setState"
     >
-  </v-btn>
+      <v-btn value="all" size="small">All</v-btn>
+      <v-tooltip text="Show favorite ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="favorites" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-star</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+      <v-tooltip text="Show non-favorite ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="not-favorites" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-star-outline</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
 </template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
new file mode 100644
index 000000000..2ad73284c
--- /dev/null
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
+import { computed } from "vue";
+import { inject } from "vue";
+import { useI18n } from "vue-i18n";
+import storeGalleryFilter from "@/stores/galleryFilter";
+import type { Events } from "@/types/emitter";
+
+const { t } = useI18n();
+const galleryFilterStore = storeGalleryFilter();
+const { filterMatched, filterUnmatched } = storeToRefs(galleryFilterStore);
+const emitter = inject<Emitter<Events>>("emitter");
+
+// Computed property to determine current state
+const matchState = computed(() => {
+  if (filterMatched.value) return "matched";
+  if (filterUnmatched.value) return "unmatched";
+  return "all";
+});
+
+// Handler for state changes
+function setMatchState(state: string) {
+  switch (state) {
+    case "matched":
+      galleryFilterStore.setFilterMatched(true);
+      break;
+    case "unmatched":
+      galleryFilterStore.setFilterUnmatched(true);
+      break;
+    default: // "all"
+      galleryFilterStore.setFilterMatched(false);
+      galleryFilterStore.setFilterUnmatched(false);
+      break;
+  }
+  emitter?.emit("filterRoms", null);
+}
+</script>
+
+<template>
+  <div
+    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
+  >
+    <div class="d-flex align-center">
+      <v-icon
+        :color="matchState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        class="mr-3"
+      >
+        mdi-file-search-outline
+      </v-icon>
+      <span
+        :class="
+          matchState !== 'all'
+            ? 'text-primary font-weight-medium'
+            : 'text-medium-emphasis'
+        "
+        class="text-body-1"
+      >
+        Match Status
+      </span>
+    </div>
+    <v-btn-toggle
+      :model-value="matchState"
+      color="primary"
+      density="compact"
+      variant="outlined"
+      @update:model-value="setMatchState"
+    >
+      <v-btn value="all" size="small"> All </v-btn>
+      <v-tooltip :text="t('platform.show-matched')" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="matched" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-file-find</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+      <v-tooltip :text="t('platform.show-unmatched')" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="unmatched" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-file-find-outline</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
+</template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchedBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchedBtn.vue
deleted file mode 100644
index 660a0aecf..000000000
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchedBtn.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import type { Emitter } from "mitt";
-import { storeToRefs } from "pinia";
-import { inject } from "vue";
-import { useI18n } from "vue-i18n";
-import storeGalleryFilter from "@/stores/galleryFilter";
-import type { Events } from "@/types/emitter";
-
-const { t } = useI18n();
-const galleryFilterStore = storeGalleryFilter();
-const { filterMatched } = storeToRefs(galleryFilterStore);
-const emitter = inject<Emitter<Events>>("emitter");
-function setUnmatched() {
-  galleryFilterStore.switchFilterMatched();
-  emitter?.emit("filterRoms", null);
-}
-</script>
-
-<template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterMatched ? 'primary' : ''"
-    @click="setUnmatched"
-  >
-    <v-icon :color="filterMatched ? 'primary' : ''"> mdi-file-find </v-icon
-    ><span
-      class="ml-2"
-      :class="{
-        'text-primary': filterMatched,
-      }"
-      >{{ t("platform.show-matched") }}</span
-    >
-  </v-btn>
-</template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
index bf5ce35eb..8224b1414 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
+import { computed } from "vue";
 import { inject } from "vue";
 import { useI18n } from "vue-i18n";
 import storeGalleryFilter from "@/stores/galleryFilter";
@@ -10,27 +11,69 @@ const { t } = useI18n();
 const galleryFilterStore = storeGalleryFilter();
 const { filterMissing } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
-function setMissing() {
-  galleryFilterStore.switchFilterMissing();
+
+// Computed property to determine current state
+const currentState = computed(() => {
+  if (filterMissing.value === true) return "missing";
+  if (filterMissing.value === false) return "not-missing";
+  return "all"; // null
+});
+
+// Handler for state changes
+function setState(state: string | null) {
+  if (!state) return;
+
+  galleryFilterStore.setFilterMissingState(
+    state as "all" | "missing" | "not-missing",
+  );
   emitter?.emit("filterRoms", null);
 }
 </script>
 
 <template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterMissing ? 'primary' : ''"
-    @click="setMissing"
+  <div
+    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
   >
-    <v-icon :color="filterMissing ? 'primary' : ''">
-      mdi-folder-question </v-icon
-    ><span
-      class="ml-2"
-      :class="{
-        'text-primary': filterMissing,
-      }"
-      >{{ t("platform.show-missing") }}</span
+    <div class="d-flex align-center">
+      <v-icon
+        :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        class="mr-3"
+      >
+        mdi-folder-question
+      </v-icon>
+      <span
+        :class="
+          currentState !== 'all'
+            ? 'text-primary font-weight-medium'
+            : 'text-medium-emphasis'
+        "
+        class="text-body-1"
+      >
+        {{ t("platform.show-missing") }}
+      </span>
+    </div>
+    <v-btn-toggle
+      :model-value="currentState"
+      color="primary"
+      density="compact"
+      variant="outlined"
+      @update:model-value="setState"
     >
-  </v-btn>
+      <v-btn value="all" size="small">All</v-btn>
+      <v-tooltip text="Show missing ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="missing" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-folder-question</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+      <v-tooltip text="Show non-missing ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="not-missing" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-folder-check</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
 </template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
index bcf82f1cf..a1239af3f 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
+import { computed } from "vue";
 import { inject } from "vue";
 import { useI18n } from "vue-i18n";
 import storeGalleryFilter from "@/stores/galleryFilter";
@@ -14,27 +15,80 @@ const { fetchTotalRoms } = storeToRefs(romsStore);
 const { filterPlayables } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
 
-function setPlayables() {
-  galleryFilterStore.switchFilterPlayables();
+// Computed property to determine current state
+const currentState = computed(() => {
+  if (filterPlayables.value === true) return "playables";
+  if (filterPlayables.value === false) return "not-playables";
+  return "all"; // null
+});
+
+// Handler for state changes
+function setState(state: string | null) {
+  if (!state) return;
+
+  galleryFilterStore.setFilterPlayablesState(
+    state as "all" | "playables" | "not-playables",
+  );
   emitter?.emit("filterRoms", null);
 }
 </script>
 
 <template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterPlayables ? 'primary' : ''"
-    :disabled="fetchTotalRoms > 10000"
-    @click="setPlayables"
+  <div
+    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
+    :class="{ 'opacity-50': fetchTotalRoms > 10000 }"
   >
-    <v-icon :color="filterPlayables ? 'primary' : ''"> mdi-play </v-icon>
-    <span
-      class="ml-2"
-      :class="{
-        'text-primary': filterPlayables,
-      }"
-      >{{ t("platform.show-playables") }}
-    </span>
-  </v-btn>
+    <div class="d-flex align-center">
+      <v-icon
+        :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        class="mr-3"
+      >
+        mdi-play
+      </v-icon>
+      <span
+        :class="
+          currentState !== 'all'
+            ? 'text-primary font-weight-medium'
+            : 'text-medium-emphasis'
+        "
+        class="text-body-1"
+      >
+        {{ t("platform.show-playables") }}
+      </span>
+    </div>
+    <v-btn-toggle
+      :model-value="currentState"
+      color="primary"
+      density="compact"
+      variant="outlined"
+      :disabled="fetchTotalRoms > 10000"
+      @update:model-value="setState"
+    >
+      <v-btn value="all" size="small">All</v-btn>
+      <v-tooltip text="Show playable ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn
+            value="playables"
+            size="small"
+            v-bind="props"
+            :disabled="fetchTotalRoms > 10000"
+          >
+            <v-icon size="x-large">mdi-play</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+      <v-tooltip text="Show non-playable ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn
+            value="not-playables"
+            size="small"
+            v-bind="props"
+            :disabled="fetchTotalRoms > 10000"
+          >
+            <v-icon size="x-large">mdi-play-outline</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
 </template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
index a97996f12..c79bee843 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
+import { computed } from "vue";
 import { inject } from "vue";
 import { useI18n } from "vue-i18n";
 import storeGalleryFilter from "@/stores/galleryFilter";
@@ -14,27 +15,81 @@ const { fetchTotalRoms } = storeToRefs(romsStore);
 const { filterRA } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
 
-function setRA() {
-  galleryFilterStore.switchFilterRA();
+// Computed property to determine current state
+const currentState = computed(() => {
+  if (filterRA.value === true) return "has-ra";
+  if (filterRA.value === false) return "no-ra";
+  return "all"; // null
+});
+
+// Handler for state changes
+function setState(state: string | null) {
+  if (!state) return;
+
+  galleryFilterStore.setFilterRAState(state as "all" | "has-ra" | "no-ra");
   emitter?.emit("filterRoms", null);
 }
 </script>
 
 <template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterRA ? 'primary' : ''"
-    :disabled="fetchTotalRoms > 10000"
-    @click="setRA"
+  <div
+    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
+    :class="{ 'opacity-50': fetchTotalRoms > 10000 }"
   >
-    <v-icon :color="filterRA ? 'primary' : ''"> mdi-trophy </v-icon>
-    <span
-      class="ml-2"
-      :class="{
-        'text-primary': filterRA,
-      }"
-      >{{ t("platform.show-ra") }}
-    </span>
-  </v-btn>
+    <div class="d-flex align-center">
+      <v-icon
+        :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        class="mr-3"
+      >
+        mdi-trophy
+      </v-icon>
+      <span
+        :class="
+          currentState !== 'all'
+            ? 'text-primary font-weight-medium'
+            : 'text-medium-emphasis'
+        "
+        class="text-body-1"
+      >
+        {{ t("platform.show-ra") }}
+      </span>
+    </div>
+    <v-btn-toggle
+      :model-value="currentState"
+      color="primary"
+      density="compact"
+      variant="outlined"
+      :disabled="fetchTotalRoms > 10000"
+      @update:model-value="setState"
+    >
+      <v-btn value="all" size="small">All</v-btn>
+      <v-tooltip text="Show ROMs with RetroAchievements only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn
+            value="has-ra"
+            size="small"
+            v-bind="props"
+            :disabled="fetchTotalRoms > 10000"
+          >
+            <v-icon size="x-large">mdi-trophy</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+      <v-tooltip
+        text="Show ROMs without RetroAchievements only"
+        location="bottom"
+      >
+        <template #activator="{ props }">
+          <v-btn
+            value="no-ra"
+            size="small"
+            v-bind="props"
+            :disabled="fetchTotalRoms > 10000"
+          >
+            <v-icon size="x-large">mdi-trophy-outline</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
 </template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue
deleted file mode 100644
index 82158d970..000000000
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterUnmatchedBtn.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script setup lang="ts">
-import type { Emitter } from "mitt";
-import { storeToRefs } from "pinia";
-import { inject } from "vue";
-import { useI18n } from "vue-i18n";
-import storeGalleryFilter from "@/stores/galleryFilter";
-import type { Events } from "@/types/emitter";
-
-const { t } = useI18n();
-const galleryFilterStore = storeGalleryFilter();
-const { filterUnmatched } = storeToRefs(galleryFilterStore);
-const emitter = inject<Emitter<Events>>("emitter");
-function setUnmatched() {
-  galleryFilterStore.switchFilterUnmatched();
-  emitter?.emit("filterRoms", null);
-}
-</script>
-
-<template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterUnmatched ? 'primary' : ''"
-    @click="setUnmatched"
-  >
-    <v-icon :color="filterUnmatched ? 'primary' : ''">
-      mdi-file-find-outline </v-icon
-    ><span
-      class="ml-2"
-      :class="{
-        'text-primary': filterUnmatched,
-      }"
-      >{{ t("platform.show-unmatched") }}</span
-    >
-  </v-btn>
-</template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
index e4ef84288..47b52a40d 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
+import { computed } from "vue";
 import { inject } from "vue";
 import { useI18n } from "vue-i18n";
 import storeGalleryFilter from "@/stores/galleryFilter";
@@ -10,27 +11,69 @@ const { t } = useI18n();
 const galleryFilterStore = storeGalleryFilter();
 const { filterVerified } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
-function setVerified() {
-  galleryFilterStore.switchFilterVerified();
+
+// Computed property to determine current state
+const currentState = computed(() => {
+  if (filterVerified.value === true) return "verified";
+  if (filterVerified.value === false) return "not-verified";
+  return "all"; // null
+});
+
+// Handler for state changes
+function setState(state: string | null) {
+  if (!state) return;
+
+  galleryFilterStore.setFilterVerifiedState(
+    state as "all" | "verified" | "not-verified",
+  );
   emitter?.emit("filterRoms", null);
 }
 </script>
 
 <template>
-  <v-btn
-    block
-    variant="tonal"
-    :color="filterVerified ? 'primary' : ''"
-    @click="setVerified"
+  <div
+    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
   >
-    <v-icon :color="filterVerified ? 'primary' : ''">
-      mdi-check-decagram </v-icon
-    ><span
-      class="ml-2"
-      :class="{
-        'text-primary': filterVerified,
-      }"
-      >{{ t("platform.show-verified") }}</span
+    <div class="d-flex align-center">
+      <v-icon
+        :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        class="mr-3"
+      >
+        mdi-check-decagram
+      </v-icon>
+      <span
+        :class="
+          currentState !== 'all'
+            ? 'text-primary font-weight-medium'
+            : 'text-medium-emphasis'
+        "
+        class="text-body-1"
+      >
+        {{ t("platform.show-verified") }}
+      </span>
+    </div>
+    <v-btn-toggle
+      :model-value="currentState"
+      color="primary"
+      density="compact"
+      variant="outlined"
+      @update:model-value="setState"
     >
-  </v-btn>
+      <v-btn value="all" size="small">All</v-btn>
+      <v-tooltip text="Show verified ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="verified" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-check-decagram</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+      <v-tooltip text="Show non-verified ROMs only" location="bottom">
+        <template #activator="{ props }">
+          <v-btn value="not-verified" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-check-decagram-outline</v-icon>
+          </v-btn>
+        </template>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
 </template>
diff --git a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
index 9244a5987..3c2b507f0 100644
--- a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
+++ b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
@@ -90,6 +90,10 @@ const filterSummary = computed(() => {
   return filters || ["No filters applied"];
 });
 
+function toggleCollectionVisibility() {
+  isPublic.value = !isPublic.value;
+}
+
 function closeDialog() {
   show.value = false;
   name.value = "";
@@ -212,12 +216,16 @@ async function createSmartCollection() {
           </v-row>
           <v-row class="pa-2" no-gutters>
             <v-col>
-              <v-switch
-                v-model="isPublic"
-                :label="t('collection.public-desc')"
-                color="primary"
-                hide-details
-              />
+              <v-btn
+                :color="isPublic ? 'romm-green' : 'accent'"
+                variant="outlined"
+                @click="toggleCollectionVisibility"
+              >
+                <v-icon class="mr-2">
+                  {{ isPublic ? "mdi-lock-open-variant" : "mdi-lock" }}
+                </v-icon>
+                {{ isPublic ? t("rom.public") : t("rom.private") }}
+              </v-btn>
             </v-col>
           </v-row>
         </v-col>
@@ -242,8 +250,7 @@ async function createSmartCollection() {
         </v-col>
       </v-row>
     </template>
-    <template #append>
-      <v-divider />
+    <template #footer>
       <v-row class="justify-center pa-2" no-gutters>
         <v-btn-group divided density="compact">
           <v-btn class="bg-toplayer" @click="closeDialog">
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 319b6403f..c5eb086eb 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -72,12 +72,12 @@ export interface GetRomsParams {
   orderDir?: string | null;
   filterUnmatched?: boolean;
   filterMatched?: boolean;
-  filterFavorites?: boolean;
-  filterDuplicates?: boolean;
-  filterPlayables?: boolean;
-  filterRA?: boolean;
-  filterMissing?: boolean;
-  filterVerified?: boolean;
+  filterFavorites?: boolean | null;
+  filterDuplicates?: boolean | null;
+  filterPlayables?: boolean | null;
+  filterRA?: boolean | null;
+  filterMissing?: boolean | null;
+  filterVerified?: boolean | null;
   groupByMetaId?: boolean;
   selectedGenre?: string | null;
   selectedFranchise?: string | null;
@@ -139,12 +139,12 @@ async function getRoms({
       language: selectedLanguage,
       ...(filterUnmatched ? { matched: false } : {}),
       ...(filterMatched ? { matched: true } : {}),
-      ...(filterFavorites ? { favorite: true } : {}),
-      ...(filterDuplicates ? { duplicate: true } : {}),
-      ...(filterPlayables ? { playable: true } : {}),
-      ...(filterMissing ? { missing: true } : {}),
-      ...(filterRA ? { has_ra: true } : {}),
-      ...(filterVerified ? { verified: true } : {}),
+      ...(filterFavorites !== null ? { favorite: filterFavorites } : {}),
+      ...(filterDuplicates !== null ? { duplicate: filterDuplicates } : {}),
+      ...(filterPlayables !== null ? { playable: filterPlayables } : {}),
+      ...(filterMissing !== null ? { missing: filterMissing } : {}),
+      ...(filterRA !== null ? { has_ra: filterRA } : {}),
+      ...(filterVerified !== null ? { verified: filterVerified } : {}),
     },
   });
 }
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index a97cbe92c..a4588b011 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -50,12 +50,22 @@ class CachedApiService {
       selected_language: params.selectedLanguage,
       ...(params.filterUnmatched ? { matched: false } : {}),
       ...(params.filterMatched ? { matched: true } : {}),
-      ...(params.filterFavorites ? { favorite: true } : {}),
-      ...(params.filterDuplicates ? { duplicate: true } : {}),
-      ...(params.filterPlayables ? { playable: true } : {}),
-      ...(params.filterMissing ? { missing: true } : {}),
-      ...(params.filterRA ? { has_ra: true } : {}),
-      ...(params.filterVerified ? { verified: true } : {}),
+      ...(params.filterFavorites !== null
+        ? { favorite: params.filterFavorites }
+        : {}),
+      ...(params.filterDuplicates !== null
+        ? { duplicate: params.filterDuplicates }
+        : {}),
+      ...(params.filterPlayables !== null
+        ? { playable: params.filterPlayables }
+        : {}),
+      ...(params.filterMissing !== null
+        ? { missing: params.filterMissing }
+        : {}),
+      ...(params.filterRA !== null ? { has_ra: params.filterRA } : {}),
+      ...(params.filterVerified !== null
+        ? { verified: params.filterVerified }
+        : {}),
     });
 
     return cacheService.request<GetRomsResponse>(config, onBackgroundUpdate);
diff --git a/frontend/src/stores/galleryFilter.ts b/frontend/src/stores/galleryFilter.ts
index f3152342a..0863ff8f0 100644
--- a/frontend/src/stores/galleryFilter.ts
+++ b/frontend/src/stores/galleryFilter.ts
@@ -28,12 +28,12 @@ const defaultFilterState = {
   filterStatuses: Object.values(romStatusMap).map((status) => status.text),
   filterUnmatched: false,
   filterMatched: false,
-  filterFavorites: false,
-  filterDuplicates: false,
-  filterPlayables: false,
-  filterRA: false,
-  filterMissing: false,
-  filterVerified: false,
+  filterFavorites: null as boolean | null, // null = all, true = favorites, false = not favorites
+  filterDuplicates: null as boolean | null, // null = all, true = duplicates, false = not duplicates
+  filterPlayables: null as boolean | null, // null = all, true = playables, false = not playables
+  filterRA: null as boolean | null, // null = all, true = has RA, false = no RA
+  filterMissing: null as boolean | null, // null = all, true = missing, false = not missing
+  filterVerified: null as boolean | null, // null = all, true = verified, false = not verified
   selectedPlatform: null as Platform | null,
   selectedGenre: null as string | null,
   selectedFranchise: null as string | null,
@@ -121,52 +121,166 @@ export default defineStore("galleryFilter", {
       this.filterMatched = !this.filterMatched;
       this.filterUnmatched = false;
     },
-    setFilterFavorites(value: boolean) {
+    setFilterFavorites(value: boolean | null) {
       this.filterFavorites = value;
     },
-    switchFilterFavorites() {
-      this.filterFavorites = !this.filterFavorites;
+    setFilterFavoritesState(state: "all" | "favorites" | "not-favorites") {
+      switch (state) {
+        case "favorites":
+          this.filterFavorites = true;
+          break;
+        case "not-favorites":
+          this.filterFavorites = false;
+          break;
+        default: // "all"
+          this.filterFavorites = null;
+          break;
+      }
     },
-    setFilterDuplicates(value: boolean) {
+    switchFilterFavorites() {
+      if (this.filterFavorites === null) {
+        this.filterFavorites = true;
+      } else if (this.filterFavorites === true) {
+        this.filterFavorites = false;
+      } else {
+        this.filterFavorites = null;
+      }
+    },
+    setFilterDuplicates(value: boolean | null) {
       this.filterDuplicates = value;
     },
-    switchFilterDuplicates() {
-      this.filterDuplicates = !this.filterDuplicates;
+    setFilterDuplicatesState(state: "all" | "duplicates" | "not-duplicates") {
+      switch (state) {
+        case "duplicates":
+          this.filterDuplicates = true;
+          break;
+        case "not-duplicates":
+          this.filterDuplicates = false;
+          break;
+        default: // "all"
+          this.filterDuplicates = null;
+          break;
+      }
     },
-    setFilterPlayables(value: boolean) {
+    switchFilterDuplicates() {
+      if (this.filterDuplicates === null) {
+        this.filterDuplicates = true;
+      } else if (this.filterDuplicates === true) {
+        this.filterDuplicates = false;
+      } else {
+        this.filterDuplicates = null;
+      }
+    },
+    setFilterPlayables(value: boolean | null) {
       this.filterPlayables = value;
     },
-    switchFilterPlayables() {
-      this.filterPlayables = !this.filterPlayables;
+    setFilterPlayablesState(state: "all" | "playables" | "not-playables") {
+      switch (state) {
+        case "playables":
+          this.filterPlayables = true;
+          break;
+        case "not-playables":
+          this.filterPlayables = false;
+          break;
+        default: // "all"
+          this.filterPlayables = null;
+          break;
+      }
     },
-    setFilterRA(value: boolean) {
+    switchFilterPlayables() {
+      if (this.filterPlayables === null) {
+        this.filterPlayables = true;
+      } else if (this.filterPlayables === true) {
+        this.filterPlayables = false;
+      } else {
+        this.filterPlayables = null;
+      }
+    },
+    setFilterRA(value: boolean | null) {
       this.filterRA = value;
     },
-    switchFilterRA() {
-      this.filterRA = !this.filterRA;
+    setFilterRAState(state: "all" | "has-ra" | "no-ra") {
+      switch (state) {
+        case "has-ra":
+          this.filterRA = true;
+          break;
+        case "no-ra":
+          this.filterRA = false;
+          break;
+        default: // "all"
+          this.filterRA = null;
+          break;
+      }
     },
-    setFilterMissing(value: boolean) {
+    switchFilterRA() {
+      if (this.filterRA === null) {
+        this.filterRA = true;
+      } else if (this.filterRA === true) {
+        this.filterRA = false;
+      } else {
+        this.filterRA = null;
+      }
+    },
+    setFilterMissing(value: boolean | null) {
       this.filterMissing = value;
     },
-    switchFilterMissing() {
-      this.filterMissing = !this.filterMissing;
+    setFilterMissingState(state: "all" | "missing" | "not-missing") {
+      switch (state) {
+        case "missing":
+          this.filterMissing = true;
+          break;
+        case "not-missing":
+          this.filterMissing = false;
+          break;
+        default: // "all"
+          this.filterMissing = null;
+          break;
+      }
     },
-    setFilterVerified(value: boolean) {
+    switchFilterMissing() {
+      if (this.filterMissing === null) {
+        this.filterMissing = true;
+      } else if (this.filterMissing === true) {
+        this.filterMissing = false;
+      } else {
+        this.filterMissing = null;
+      }
+    },
+    setFilterVerified(value: boolean | null) {
       this.filterVerified = value;
     },
+    setFilterVerifiedState(state: "all" | "verified" | "not-verified") {
+      switch (state) {
+        case "verified":
+          this.filterVerified = true;
+          break;
+        case "not-verified":
+          this.filterVerified = false;
+          break;
+        default: // "all"
+          this.filterVerified = null;
+          break;
+      }
+    },
     switchFilterVerified() {
-      this.filterVerified = !this.filterVerified;
+      if (this.filterVerified === null) {
+        this.filterVerified = true;
+      } else if (this.filterVerified === true) {
+        this.filterVerified = false;
+      } else {
+        this.filterVerified = null;
+      }
     },
     isFiltered() {
       return Boolean(
         this.filterUnmatched ||
           this.filterMatched ||
-          this.filterFavorites ||
-          this.filterDuplicates ||
-          this.filterPlayables ||
-          this.filterRA ||
-          this.filterMissing ||
-          this.filterVerified ||
+          this.filterFavorites !== null ||
+          this.filterDuplicates !== null ||
+          this.filterPlayables !== null ||
+          this.filterRA !== null ||
+          this.filterMissing !== null ||
+          this.filterVerified !== null ||
           this.selectedPlatform ||
           this.selectedGenre ||
           this.selectedFranchise ||
@@ -193,12 +307,12 @@ export default defineStore("galleryFilter", {
       this.selectedStatus = null;
       this.filterUnmatched = false;
       this.filterMatched = false;
-      this.filterFavorites = false;
-      this.filterDuplicates = false;
-      this.filterPlayables = false;
-      this.filterRA = false;
-      this.filterMissing = false;
-      this.filterVerified = false;
+      this.filterFavorites = null;
+      this.filterDuplicates = null;
+      this.filterPlayables = null;
+      this.filterRA = null;
+      this.filterMissing = null;
+      this.filterVerified = null;
     },
   },
 });

From a6d0d9be80b30a6bdf5ec25e49b10a34266c375d Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 15:01:38 +0000
Subject: [PATCH 04/73] Enhance API parameter handling to support multi-value
 filters for genre, franchise, collection, company, age rating, region, and
 language. Update serialization logic to maintain query parameters on refresh.

---
 .../Dialog/CreateSmartCollection.vue          |  5 +++-
 frontend/src/services/api/index.ts            | 27 ++++++++++++++++++-
 frontend/src/services/api/rom.ts              | 14 +++++-----
 frontend/src/services/cache/api.ts            | 20 +++++++++-----
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
index 3c2b507f0..7169568cc 100644
--- a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
+++ b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
@@ -114,7 +114,10 @@ async function createSmartCollection() {
   emitter?.emit("showLoadingDialog", { loading: true, scrim: true });
 
   try {
-    const filterCriteria: Record<string, number | boolean | string | null> = {};
+    const filterCriteria: Record<
+      string,
+      number | boolean | string | string[] | null
+    > = {};
 
     if (searchTerm.value) filterCriteria.search_term = searchTerm.value;
     if (selectedPlatform.value)
diff --git a/frontend/src/services/api/index.ts b/frontend/src/services/api/index.ts
index c1cd001b2..d10762f8c 100644
--- a/frontend/src/services/api/index.ts
+++ b/frontend/src/services/api/index.ts
@@ -4,7 +4,32 @@ import { debounce } from "lodash";
 import router from "@/plugins/router";
 import { ROUTES } from "@/plugins/router";
 
-const api = axios.create({ baseURL: "/api", timeout: 120000 });
+const api = axios.create({
+  // This will keep the url query params on refresh
+  baseURL: "/api",
+  timeout: 120000,
+  paramsSerializer: {
+    serialize: (params) => {
+      const searchParams = new URLSearchParams();
+
+      Object.keys(params).forEach((key) => {
+        const value = params[key];
+        if (Array.isArray(value)) {
+          // Handle arrays by repeating the parameter name (not adding [])
+          value.forEach((item) => {
+            if (item !== undefined && item !== null) {
+              searchParams.append(key, String(item));
+            }
+          });
+        } else if (value !== undefined && value !== null) {
+          searchParams.append(key, String(value));
+        }
+      });
+
+      return searchParams.toString();
+    },
+  },
+});
 
 const inflightRequests = new Set();
 
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index c5eb086eb..48fe7cb34 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -129,14 +129,14 @@ async function getRoms({
       order_by: orderBy,
       order_dir: orderDir,
       group_by_meta_id: groupByMetaId,
-      genre: selectedGenre,
-      franchise: selectedFranchise,
-      collection: selectedCollection,
-      company: selectedCompany,
-      age_rating: selectedAgeRating,
+      genre: selectedGenre ? [selectedGenre] : undefined,
+      franchise: selectedFranchise ? [selectedFranchise] : undefined,
+      collection: selectedCollection ? [selectedCollection] : undefined,
+      company: selectedCompany ? [selectedCompany] : undefined,
+      age_rating: selectedAgeRating ? [selectedAgeRating] : undefined,
       selected_status: getStatusKeyForText(selectedStatus),
-      region: selectedRegion,
-      language: selectedLanguage,
+      region: selectedRegion ? [selectedRegion] : undefined,
+      language: selectedLanguage ? [selectedLanguage] : undefined,
       ...(filterUnmatched ? { matched: false } : {}),
       ...(filterMatched ? { matched: true } : {}),
       ...(filterFavorites !== null ? { favorite: filterFavorites } : {}),
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index a4588b011..4ad9cfa38 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -40,14 +40,20 @@ class CachedApiService {
       order_by: params.orderBy,
       order_dir: params.orderDir,
       group_by_meta_id: params.groupByMetaId,
-      selected_genre: params.selectedGenre,
-      selected_franchise: params.selectedFranchise,
-      selected_collection: params.selectedCollection,
-      selected_company: params.selectedCompany,
-      selected_age_rating: params.selectedAgeRating,
+      genre: params.selectedGenre ? [params.selectedGenre] : undefined,
+      franchise: params.selectedFranchise
+        ? [params.selectedFranchise]
+        : undefined,
+      collection: params.selectedCollection
+        ? [params.selectedCollection]
+        : undefined,
+      company: params.selectedCompany ? [params.selectedCompany] : undefined,
+      age_rating: params.selectedAgeRating
+        ? [params.selectedAgeRating]
+        : undefined,
       selected_status: getStatusKeyForText(params.selectedStatus ?? null),
-      selected_region: params.selectedRegion,
-      selected_language: params.selectedLanguage,
+      region: params.selectedRegion ? [params.selectedRegion] : undefined,
+      language: params.selectedLanguage ? [params.selectedLanguage] : undefined,
       ...(params.filterUnmatched ? { matched: false } : {}),
       ...(params.filterMatched ? { matched: true } : {}),
       ...(params.filterFavorites !== null

From 1902900ca21e0721ace8109db37e2b14d1264c6f Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 16:13:06 +0000
Subject: [PATCH 05/73] Refactor MissingFromFSIcon placement in Platform card
 component for improved visibility and styling.

---
 frontend/src/components/common/Platform/Card.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/common/Platform/Card.vue b/frontend/src/components/common/Platform/Card.vue
index ec05409f6..084f3f07c 100644
--- a/frontend/src/components/common/Platform/Card.vue
+++ b/frontend/src/components/common/Platform/Card.vue
@@ -66,11 +66,6 @@ onBeforeUnmount(() => {
     >
       <v-card-text>
         <v-row class="pa-1 justify-center align-center bg-background">
-          <MissingFromFSIcon
-            v-if="platform.missing_from_fs"
-            text="Missing platform from filesystem"
-            :size="15"
-          />
           <div
             :title="platform.display_name"
             class="px-2 text-truncate text-caption"
@@ -87,6 +82,13 @@ onBeforeUnmount(() => {
             :size="105"
             class="mt-2"
           />
+          <MissingFromFSIcon
+            v-if="platform.missing_from_fs"
+            text="Missing platform from filesystem"
+            class="position-absolute"
+            style="top: 2.5rem; right: 1rem"
+            :size="22"
+          />
           <v-chip
             class="bg-background position-absolute"
             size="x-small"

From 08df8e325532c873758730a8d80b70abbbfa9991 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 16:55:31 +0000
Subject: [PATCH 06/73] Refactor filter buttons in FilterDrawer for improved
 styling and functionality; add FilterPlatformBtn component.

---
 .../AppBar/common/FilterDrawer/Base.vue       | 81 ++-----------------
 .../FilterDrawer/FilterDuplicatesBtn.vue      |  6 +-
 .../FilterDrawer/FilterFavoritesBtn.vue       |  8 +-
 .../FilterDrawer/FilterMatchStateBtn.vue      |  8 +-
 .../common/FilterDrawer/FilterMissingBtn.vue  |  8 +-
 .../common/FilterDrawer/FilterPlatformBtn.vue | 81 +++++++++++++++++++
 .../FilterDrawer/FilterPlayablesBtn.vue       |  6 +-
 .../common/FilterDrawer/FilterRaBtn.vue       |  6 +-
 .../common/FilterDrawer/FilterVerifiedBtn.vue |  8 +-
 9 files changed, 117 insertions(+), 95 deletions(-)
 create mode 100644 frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index cd33af854..44a7c8fba 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -11,11 +11,10 @@ import FilterDuplicatesBtn from "@/components/Gallery/AppBar/common/FilterDrawer
 import FilterFavoritesBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue";
 import FilterMatchStateBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue";
 import FilterMissingBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue";
+import FilterPlatformBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue";
 import FilterPlayablesBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue";
 import FilterRaBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue";
 import FilterVerifiedBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue";
-import MissingFromFSIcon from "@/components/common/MissingFromFSIcon.vue";
-import PlatformIcon from "@/components/common/Platform/PlatformIcon.vue";
 import storeGalleryFilter from "@/stores/galleryFilter";
 import storePlatforms from "@/stores/platforms";
 import storeRoms from "@/stores/roms";
@@ -64,7 +63,6 @@ const {
   selectedStatus,
   filterStatuses,
   selectedPlatform,
-  filterPlatforms,
   selectedRegion,
   filterRegions,
   selectedLanguage,
@@ -324,11 +322,9 @@ onMounted(async () => {
     class="bg-surface rounded mt-4 mb-2 pa-1 unset-height"
   >
     <v-list tabindex="-1">
-      <template v-if="showSearchBar && xs">
-        <v-list-item>
-          <SearchTextField :tabindex="activeFilterDrawer ? 0 : -1" />
-        </v-list-item>
-      </template>
+      <v-list-item v-if="showSearchBar && xs">
+        <SearchTextField :tabindex="activeFilterDrawer ? 0 : -1" />
+      </v-list-item>
       <v-list-item>
         <FilterMatchStateBtn :tabindex="activeFilterDrawer ? 0 : -1" />
         <FilterFavoritesBtn
@@ -354,82 +350,21 @@ onMounted(async () => {
         />
         <FilterRaBtn class="mt-2" :tabindex="activeFilterDrawer ? 0 : -1" />
       </v-list-item>
-      <v-list-item
-        v-if="showPlatformsFilter"
-        :tabindex="activeFilterDrawer ? 0 : -1"
-      >
-        <v-autocomplete
-          v-model="selectedPlatform"
-          :tabindex="activeFilterDrawer ? 0 : -1"
-          hide-details
-          prepend-inner-icon="mdi-controller"
-          clearable
-          :label="t('common.platform')"
-          variant="outlined"
-          density="comfortable"
-          :items="filterPlatforms"
-          @update:model-value="
-            nextTick(() => emitter?.emit('filterRoms', null))
-          "
-        >
-          <template #item="{ props, item }">
-            <v-list-item
-              v-bind="props"
-              class="py-4"
-              :title="item.raw.name ?? ''"
-              :subtitle="item.raw.fs_slug"
-            >
-              <template #prepend>
-                <PlatformIcon
-                  :key="item.raw.slug"
-                  :size="35"
-                  :slug="item.raw.slug"
-                  :name="item.raw.name"
-                  :fs-slug="item.raw.fs_slug"
-                />
-              </template>
-              <template #append>
-                <MissingFromFSIcon
-                  v-if="item.raw.missing_from_fs"
-                  text="Missing platform from filesystem"
-                  chip
-                  chip-label
-                  chip-density="compact"
-                  class="ml-2"
-                />
-                <v-chip class="ml-2" size="x-small" label>
-                  {{ item.raw.rom_count }}
-                </v-chip>
-              </template>
-            </v-list-item>
-          </template>
-          <template #chip="{ item }">
-            <v-chip>
-              <PlatformIcon
-                :key="item.raw.slug"
-                :slug="item.raw.slug"
-                :name="item.raw.name"
-                :fs-slug="item.raw.fs_slug"
-                :size="20"
-                class="mr-2"
-              />
-              {{ item.raw.name }}
-            </v-chip>
-          </template>
-        </v-autocomplete>
+      <v-list-item v-if="showPlatformsFilter">
+        <FilterPlatformBtn :tabindex="activeFilterDrawer ? 0 : -1" />
       </v-list-item>
       <v-list-item
         v-for="filter in filters"
         :key="filter.label"
         :tabindex="activeFilterDrawer ? 0 : -1"
       >
-        <v-autocomplete
+        <v-select
           v-model="filter.selected.value"
           :tabindex="activeFilterDrawer ? 0 : -1"
           hide-details
           clearable
           :label="filter.label"
-          variant="solo-filled"
+          variant="outlined"
           density="comfortable"
           :items="filter.items.value"
           @update:model-value="
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
index ece15b2dc..6f79fe527 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
@@ -35,7 +35,7 @@ function setState(state: string | null) {
 
 <template>
   <div
-    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
+    class="d-flex align-center justify-space-between py-2"
     :class="{ 'opacity-50': fetchTotalRoms > 10000 }"
   >
     <div class="d-flex align-center">
@@ -64,7 +64,9 @@ function setState(state: string | null) {
       :disabled="fetchTotalRoms > 10000"
       @update:model-value="setState"
     >
-      <v-btn value="all" size="small">All</v-btn>
+      <v-btn value="all" size="small"
+        ><v-icon size="x-large">mdi-cancel</v-icon>
+      </v-btn>
       <v-tooltip text="Show duplicate ROMs only" location="bottom">
         <template #activator="{ props }">
           <v-btn
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
index 1c8f8afc1..b0368f775 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
@@ -31,9 +31,7 @@ function setState(state: string | null) {
 </script>
 
 <template>
-  <div
-    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
-  >
+  <div class="d-flex align-center justify-space-between py-2">
     <div class="d-flex align-center">
       <v-icon
         :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
@@ -59,7 +57,9 @@ function setState(state: string | null) {
       variant="outlined"
       @update:model-value="setState"
     >
-      <v-btn value="all" size="small">All</v-btn>
+      <v-btn value="all" size="small"
+        ><v-icon size="x-large">mdi-cancel</v-icon>
+      </v-btn>
       <v-tooltip text="Show favorite ROMs only" location="bottom">
         <template #activator="{ props }">
           <v-btn value="favorites" size="small" v-bind="props">
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
index 2ad73284c..e0c4f4139 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
@@ -38,9 +38,7 @@ function setMatchState(state: string) {
 </script>
 
 <template>
-  <div
-    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
-  >
+  <div class="d-flex align-center justify-space-between py-2">
     <div class="d-flex align-center">
       <v-icon
         :color="matchState !== 'all' ? 'primary' : 'grey-lighten-1'"
@@ -66,7 +64,9 @@ function setMatchState(state: string) {
       variant="outlined"
       @update:model-value="setMatchState"
     >
-      <v-btn value="all" size="small"> All </v-btn>
+      <v-btn value="all" size="small"
+        ><v-icon size="x-large">mdi-cancel</v-icon>
+      </v-btn>
       <v-tooltip :text="t('platform.show-matched')" location="bottom">
         <template #activator="{ props }">
           <v-btn value="matched" size="small" v-bind="props">
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
index 8224b1414..e358d2b43 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
@@ -31,9 +31,7 @@ function setState(state: string | null) {
 </script>
 
 <template>
-  <div
-    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
-  >
+  <div class="d-flex align-center justify-space-between py-2">
     <div class="d-flex align-center">
       <v-icon
         :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
@@ -59,7 +57,9 @@ function setState(state: string | null) {
       variant="outlined"
       @update:model-value="setState"
     >
-      <v-btn value="all" size="small">All</v-btn>
+      <v-btn value="all" size="small"
+        ><v-icon size="x-large">mdi-cancel</v-icon>
+      </v-btn>
       <v-tooltip text="Show missing ROMs only" location="bottom">
         <template #activator="{ props }">
           <v-btn value="missing" size="small" v-bind="props">
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
new file mode 100644
index 000000000..9416c4365
--- /dev/null
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
@@ -0,0 +1,81 @@
+<script setup lang="ts">
+import type { Emitter } from "mitt";
+import { storeToRefs } from "pinia";
+import { inject, nextTick } from "vue";
+import { useI18n } from "vue-i18n";
+import MissingFromFSIcon from "@/components/common/MissingFromFSIcon.vue";
+import PlatformIcon from "@/components/common/Platform/PlatformIcon.vue";
+import storeGalleryFilter from "@/stores/galleryFilter";
+import type { Events } from "@/types/emitter";
+
+defineProps<{
+  tabindex?: number;
+}>();
+
+const { t } = useI18n();
+const galleryFilterStore = storeGalleryFilter();
+const { selectedPlatform, filterPlatforms } = storeToRefs(galleryFilterStore);
+const emitter = inject<Emitter<Events>>("emitter");
+</script>
+
+<template>
+  <v-select
+    v-model="selectedPlatform"
+    :tabindex="tabindex"
+    hide-details
+    :label="t('common.platform')"
+    clearable
+    variant="outlined"
+    density="comfortable"
+    :items="filterPlatforms"
+    @update:model-value="nextTick(() => emitter?.emit('filterRoms', null))"
+  >
+    <template #prepend-inner>
+      <v-icon class="ml-2 mr-1">mdi-controller</v-icon>
+    </template>
+    <template #item="{ props, item }">
+      <v-list-item
+        v-bind="props"
+        class="py-4"
+        :title="item.raw.name ?? ''"
+        :subtitle="item.raw.fs_slug"
+      >
+        <template #prepend>
+          <PlatformIcon
+            :key="item.raw.slug"
+            :size="35"
+            :slug="item.raw.slug"
+            :name="item.raw.name"
+            :fs-slug="item.raw.fs_slug"
+          />
+        </template>
+        <template #append>
+          <MissingFromFSIcon
+            v-if="item.raw.missing_from_fs"
+            text="Missing platform from filesystem"
+            chip
+            chip-label
+            chip-density="compact"
+            class="ml-2"
+          />
+          <v-chip class="ml-2" size="x-small" label>
+            {{ item.raw.rom_count }}
+          </v-chip>
+        </template>
+      </v-list-item>
+    </template>
+    <template #chip="{ item }">
+      <v-chip>
+        <PlatformIcon
+          :key="item.raw.slug"
+          :slug="item.raw.slug"
+          :name="item.raw.name"
+          :fs-slug="item.raw.fs_slug"
+          :size="20"
+          class="mr-2"
+        />
+        {{ item.raw.name }}
+      </v-chip>
+    </template>
+  </v-select>
+</template>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
index a1239af3f..469ea23e3 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
@@ -35,7 +35,7 @@ function setState(state: string | null) {
 
 <template>
   <div
-    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
+    class="d-flex align-center justify-space-between py-2"
     :class="{ 'opacity-50': fetchTotalRoms > 10000 }"
   >
     <div class="d-flex align-center">
@@ -64,7 +64,9 @@ function setState(state: string | null) {
       :disabled="fetchTotalRoms > 10000"
       @update:model-value="setState"
     >
-      <v-btn value="all" size="small">All</v-btn>
+      <v-btn value="all" size="small"
+        ><v-icon size="x-large">mdi-cancel</v-icon>
+      </v-btn>
       <v-tooltip text="Show playable ROMs only" location="bottom">
         <template #activator="{ props }">
           <v-btn
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
index c79bee843..5560353e8 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
@@ -33,7 +33,7 @@ function setState(state: string | null) {
 
 <template>
   <div
-    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
+    class="d-flex align-center justify-space-between py-2"
     :class="{ 'opacity-50': fetchTotalRoms > 10000 }"
   >
     <div class="d-flex align-center">
@@ -62,7 +62,9 @@ function setState(state: string | null) {
       :disabled="fetchTotalRoms > 10000"
       @update:model-value="setState"
     >
-      <v-btn value="all" size="small">All</v-btn>
+      <v-btn value="all" size="small"
+        ><v-icon size="x-large">mdi-cancel</v-icon>
+      </v-btn>
       <v-tooltip text="Show ROMs with RetroAchievements only" location="bottom">
         <template #activator="{ props }">
           <v-btn
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
index 47b52a40d..fd83b478c 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
@@ -31,9 +31,7 @@ function setState(state: string | null) {
 </script>
 
 <template>
-  <div
-    class="d-flex align-center justify-space-between py-2 px-4 rounded-lg border"
-  >
+  <div class="d-flex align-center justify-space-between py-2">
     <div class="d-flex align-center">
       <v-icon
         :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
@@ -59,7 +57,9 @@ function setState(state: string | null) {
       variant="outlined"
       @update:model-value="setState"
     >
-      <v-btn value="all" size="small">All</v-btn>
+      <v-btn value="all" size="small"
+        ><v-icon size="x-large">mdi-cancel</v-icon>
+      </v-btn>
       <v-tooltip text="Show verified ROMs only" location="bottom">
         <template #activator="{ props }">
           <v-btn value="verified" size="small" v-bind="props">

From c261d73776a5a24e5bbb1808010478bd96313d13 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 17:16:55 +0000
Subject: [PATCH 07/73] Add search term handling and debounce logic to filter
 options; enhance filter reset functionality

---
 .../AppBar/common/FilterDrawer/Base.vue       | 112 ++++++++++++++----
 1 file changed, 92 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 44a7c8fba..e6af15e50 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -2,7 +2,7 @@
 import { debounce } from "lodash";
 import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
-import { inject, nextTick, onMounted, watch } from "vue";
+import { inject, nextTick, onMounted, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 import { useDisplay } from "vuetify";
@@ -15,9 +15,10 @@ import FilterPlatformBtn from "@/components/Gallery/AppBar/common/FilterDrawer/F
 import FilterPlayablesBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue";
 import FilterRaBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue";
 import FilterVerifiedBtn from "@/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue";
+import cachedApiService from "@/services/cache/api";
 import storeGalleryFilter from "@/stores/galleryFilter";
 import storePlatforms from "@/stores/platforms";
-import storeRoms from "@/stores/roms";
+import storeRoms, { type SimpleRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
 
 withDefaults(
@@ -115,6 +116,16 @@ const onFilterChange = debounce(
   { leading: false, trailing: true },
 );
 
+// Separate debounced function for search term changes
+const onSearchChange = debounce(
+  async () => {
+    await fetchSearchFilteredRoms();
+    setFilters();
+  },
+  500,
+  { leading: false, trailing: true },
+);
+
 emitter?.on("filterRoms", onFilterChange);
 
 const filters = [
@@ -162,48 +173,98 @@ const filters = [
 
 function resetFilters() {
   galleryFilterStore.resetFilters();
-  nextTick(() => emitter?.emit("filterRoms", null));
+  nextTick(async () => {
+    await fetchSearchFilteredRoms();
+    setFilters();
+    emitter?.emit("filterRoms", null);
+  });
+}
+
+// Store search-filtered ROMs for populating filter options
+let searchFilteredRoms = ref<SimpleRom[]>([]);
+
+async function fetchSearchFilteredRoms() {
+  try {
+    // Fetch ROMs with only search term applied (and current platform/collection context)
+    const response = await cachedApiService.getRoms(
+      {
+        searchTerm: searchTerm.value,
+        platformId: romsStore.currentPlatform?.id ?? null,
+        collectionId: romsStore.currentCollection?.id ?? null,
+        virtualCollectionId: romsStore.currentVirtualCollection?.id ?? null,
+        smartCollectionId: romsStore.currentSmartCollection?.id ?? null,
+        limit: romsStore.fetchLimit,
+        offset: romsStore.fetchOffset,
+        orderBy: romsStore.orderBy,
+        orderDir: romsStore.orderDir,
+        // Exclude all other filters
+        filterUnmatched: false,
+        filterMatched: false,
+        filterFavorites: null,
+        filterDuplicates: null,
+        filterPlayables: null,
+        filterRA: null,
+        filterMissing: null,
+        filterVerified: null,
+        selectedGenre: null,
+        selectedFranchise: null,
+        selectedCollection: null,
+        selectedCompany: null,
+        selectedAgeRating: null,
+        selectedRegion: null,
+        selectedLanguage: null,
+        selectedStatus: null,
+      },
+      () => {}, // No background update callback needed
+    );
+    searchFilteredRoms.value = response.data.items;
+  } catch (error) {
+    console.error("Failed to fetch search-filtered ROMs:", error);
+    // Fall back to current filtered ROMs if search-only fetch fails
+    searchFilteredRoms.value = romsStore.filteredRoms;
+  }
 }
 
 function setFilters() {
+  const romsForFilters =
+    searchFilteredRoms.value.length > 0
+      ? searchFilteredRoms.value
+      : romsStore.filteredRoms;
+
   galleryFilterStore.setFilterPlatforms([
     ...new Set(
-      romsStore.filteredRoms
+      romsForFilters
         .flatMap((rom) => platformsStore.get(rom.platform_id))
         .filter((platform) => !!platform)
         .sort(),
     ),
   ]);
   galleryFilterStore.setFilterGenres([
-    ...new Set(
-      romsStore.filteredRoms.flatMap((rom) => rom.metadatum.genres).sort(),
-    ),
+    ...new Set(romsForFilters.flatMap((rom) => rom.metadatum.genres).sort()),
   ]);
   galleryFilterStore.setFilterFranchises([
     ...new Set(
-      romsStore.filteredRoms.flatMap((rom) => rom.metadatum.franchises).sort(),
+      romsForFilters.flatMap((rom) => rom.metadatum.franchises).sort(),
     ),
   ]);
   galleryFilterStore.setFilterCompanies([
-    ...new Set(
-      romsStore.filteredRoms.flatMap((rom) => rom.metadatum.companies).sort(),
-    ),
+    ...new Set(romsForFilters.flatMap((rom) => rom.metadatum.companies).sort()),
   ]);
   galleryFilterStore.setFilterCollections([
     ...new Set(
-      romsStore.filteredRoms.flatMap((rom) => rom.metadatum.collections).sort(),
+      romsForFilters.flatMap((rom) => rom.metadatum.collections).sort(),
     ),
   ]);
   galleryFilterStore.setFilterAgeRatings([
     ...new Set(
-      romsStore.filteredRoms.flatMap((rom) => rom.metadatum.age_ratings).sort(),
+      romsForFilters.flatMap((rom) => rom.metadatum.age_ratings).sort(),
     ),
   ]);
   galleryFilterStore.setFilterRegions([
-    ...new Set(romsStore.filteredRoms.flatMap((rom) => rom.regions).sort()),
+    ...new Set(romsForFilters.flatMap((rom) => rom.regions).sort()),
   ]);
   galleryFilterStore.setFilterLanguages([
-    ...new Set(romsStore.filteredRoms.flatMap((rom) => rom.languages).sort()),
+    ...new Set(romsForFilters.flatMap((rom) => rom.languages).sort()),
   ]);
 }
 
@@ -290,21 +351,32 @@ onMounted(async () => {
     romsStore.resetPagination();
   }
 
+  // Initial fetch of search-filtered ROMs for filter options
+  await fetchSearchFilteredRoms();
+  setFilters();
+
   // Fire off search if URL state prepopulated
   if (freshSearch || galleryFilterStore.isFiltered()) {
     emitter?.emit("filterRoms", null);
   }
 
+  // Watch for search term changes to update filter options
   watch(
-    () => filteredRoms.value,
-    async () => setFilters(),
-    { immediate: true }, // Ensure watcher is triggered immediately
+    () => searchTerm.value,
+    async () => {
+      await onSearchChange();
+    },
+    { immediate: false },
   );
 
+  // Watch for platform changes to update filter options
   watch(
     () => allPlatforms.value,
-    async () => setFilters(),
-    { immediate: true }, // Ensure watcher is triggered immediately
+    async () => {
+      await fetchSearchFilteredRoms();
+      setFilters();
+    },
+    { immediate: false },
   );
 });
 </script>

From 85e4f0a4338f466ebbbdbde75d534627dc255f8e Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 19:19:09 +0000
Subject: [PATCH 08/73] Enhance multi-value filter functionality with logic
 operators for genres, franchises, collections, companies, age ratings,
 regions, and languages. Update API and frontend components to support new
 filter states and logic. Refactor gallery filter store and API service to
 accommodate multi-value selections and maintain backward compatibility with
 single-value filters. Improve UI for filter options in the gallery app,
 including logic toggle buttons for better user interaction.

---
 backend/endpoints/rom.py                      |  58 ++++
 backend/handler/database/roms_handler.py      |  50 ++-
 .../AppBar/common/FilterDrawer/Base.vue       | 317 +++++++++++++++---
 frontend/src/locales/en_GB/common.json        |   6 +-
 frontend/src/services/api/rom.ts              | 131 ++++++--
 frontend/src/services/cache/api.ts            |  83 ++++-
 frontend/src/stores/galleryFilter.ts          | 103 +++++-
 frontend/src/stores/roms.ts                   |  87 ++++-
 8 files changed, 728 insertions(+), 107 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 0ff26dfee..2233408e4 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -349,6 +349,56 @@ def get_roms(
         str,
         Query(description="Order direction, either 'asc' or 'desc'."),
     ] = "asc",
+    # Logic operators for multi-value filters
+    genres_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for genres filter: 'any' (OR) or 'all' (AND).",
+            alias="genres_logic",
+        ),
+    ] = "any",
+    franchises_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for franchises filter: 'any' (OR) or 'all' (AND).",
+            alias="franchises_logic",
+        ),
+    ] = "any",
+    collections_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for collections filter: 'any' (OR) or 'all' (AND).",
+            alias="collections_logic",
+        ),
+    ] = "any",
+    companies_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for companies filter: 'any' (OR) or 'all' (AND).",
+            alias="companies_logic",
+        ),
+    ] = "any",
+    age_ratings_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for age ratings filter: 'any' (OR) or 'all' (AND).",
+            alias="age_ratings_logic",
+        ),
+    ] = "any",
+    regions_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for regions filter: 'any' (OR) or 'all' (AND).",
+            alias="regions_logic",
+        ),
+    ] = "any",
+    languages_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for languages filter: 'any' (OR) or 'all' (AND).",
+            alias="languages_logic",
+        ),
+    ] = "any",
 ) -> CustomLimitOffsetPage[SimpleRomSchema]:
     """Retrieve roms."""
 
@@ -420,6 +470,14 @@ def get_roms(
         selected_status=selected_status,
         regions=regions,
         languages=languages,
+        # Logic operators
+        genres_logic=genres_logic,
+        franchises_logic=franchises_logic,
+        collections_logic=collections_logic,
+        companies_logic=companies_logic,
+        age_ratings_logic=age_ratings_logic,
+        regions_logic=regions_logic,
+        languages_logic=languages_logic,
         group_by_meta_id=group_by_meta_id,
     )
 
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index cd57f6ec7..494e32328 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -436,6 +436,14 @@ class DBRomsHandler(DBBaseHandler):
         selected_status: str | None = None,
         regions: Sequence[str] | None = None,
         languages: Sequence[str] | None = None,
+        # Logic operators for multi-value filters
+        genres_logic: str = "any",
+        franchises_logic: str = "any",
+        collections_logic: str = "any",
+        companies_logic: str = "any",
+        age_ratings_logic: str = "any",
+        regions_logic: str = "any",
+        languages_logic: str = "any",
         user_id: int | None = None,
         session: Session = None,
     ) -> Query[Rom]:
@@ -597,25 +605,53 @@ class DBRomsHandler(DBBaseHandler):
 
         # Apply metadata filters efficiently
         if genres:
-            query = self.filter_by_genres(query, session=session, values=genres)
+            query = self.filter_by_genres(
+                query, session=session, values=genres, match_all=(genres_logic == "all")
+            )
         if franchises:
-            query = self.filter_by_franchises(query, session=session, values=franchises)
+            query = self.filter_by_franchises(
+                query,
+                session=session,
+                values=franchises,
+                match_all=(franchises_logic == "all"),
+            )
         if collections:
             query = self.filter_by_collections(
-                query, session=session, values=collections
+                query,
+                session=session,
+                values=collections,
+                match_all=(collections_logic == "all"),
             )
         if companies:
-            query = self.filter_by_companies(query, session=session, values=companies)
+            query = self.filter_by_companies(
+                query,
+                session=session,
+                values=companies,
+                match_all=(companies_logic == "all"),
+            )
         if age_ratings:
             query = self.filter_by_age_ratings(
-                query, session=session, values=age_ratings
+                query,
+                session=session,
+                values=age_ratings,
+                match_all=(age_ratings_logic == "all"),
             )
 
         # Apply rom-level filters
         if regions:
-            query = self.filter_by_regions(query, session=session, values=regions)
+            query = self.filter_by_regions(
+                query,
+                session=session,
+                values=regions,
+                match_all=(regions_logic == "all"),
+            )
         if languages:
-            query = self.filter_by_languages(query, session=session, values=languages)
+            query = self.filter_by_languages(
+                query,
+                session=session,
+                values=languages,
+                match_all=(languages_logic == "all"),
+            )
 
         # The RomUser table is already joined if user_id is set
         if selected_status and user_id:
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index e6af15e50..e42481774 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -53,21 +53,37 @@ const {
   filterVerified,
   selectedGenre,
   filterGenres,
+  selectedGenres,
+  genresLogic,
   selectedFranchise,
   filterFranchises,
+  selectedFranchises,
+  franchisesLogic,
   selectedCollection,
   filterCollections,
+  selectedCollections,
+  collectionsLogic,
   selectedCompany,
   filterCompanies,
+  selectedCompanies,
+  companiesLogic,
   selectedAgeRating,
   filterAgeRatings,
+  selectedAgeRatings,
+  ageRatingsLogic,
   selectedStatus,
   filterStatuses,
+  selectedStatuses,
+  statusesLogic,
   selectedPlatform,
   selectedRegion,
   filterRegions,
+  selectedRegions,
+  regionsLogic,
   selectedLanguage,
   filterLanguages,
+  selectedLanguages,
+  languagesLogic,
 } = storeToRefs(galleryFilterStore);
 const { filteredRoms } = storeToRefs(romsStore);
 const { allPlatforms } = storeToRefs(platformsStore);
@@ -94,13 +110,58 @@ const onFilterChange = debounce(
         ? String(selectedPlatform.value.id)
         : null,
       genre: selectedGenre.value,
+      genres:
+        selectedGenres.value.length > 0 ? selectedGenres.value.join(",") : null,
+      genresLogic: selectedGenres.value.length > 1 ? genresLogic.value : null,
       franchise: selectedFranchise.value,
+      franchises:
+        selectedFranchises.value.length > 0
+          ? selectedFranchises.value.join(",")
+          : null,
+      franchisesLogic:
+        selectedFranchises.value.length > 1 ? franchisesLogic.value : null,
       collection: selectedCollection.value,
+      collections:
+        selectedCollections.value.length > 0
+          ? selectedCollections.value.join(",")
+          : null,
+      collectionsLogic:
+        selectedCollections.value.length > 1 ? collectionsLogic.value : null,
       company: selectedCompany.value,
+      companies:
+        selectedCompanies.value.length > 0
+          ? selectedCompanies.value.join(",")
+          : null,
+      companiesLogic:
+        selectedCompanies.value.length > 1 ? companiesLogic.value : null,
       ageRating: selectedAgeRating.value,
+      ageRatings:
+        selectedAgeRatings.value.length > 0
+          ? selectedAgeRatings.value.join(",")
+          : null,
+      ageRatingsLogic:
+        selectedAgeRatings.value.length > 1 ? ageRatingsLogic.value : null,
       region: selectedRegion.value,
+      regions:
+        selectedRegions.value.length > 0
+          ? selectedRegions.value.join(",")
+          : null,
+      regionsLogic:
+        selectedRegions.value.length > 1 ? regionsLogic.value : null,
       language: selectedLanguage.value,
+      languages:
+        selectedLanguages.value.length > 0
+          ? selectedLanguages.value.join(",")
+          : null,
+      languagesLogic:
+        selectedLanguages.value.length > 1 ? languagesLogic.value : null,
       status: selectedStatus.value,
+      statuses:
+        selectedStatuses.value.length > 0
+          ? selectedStatuses.value.join(",")
+          : null,
+      statusesLogic:
+        selectedStatuses.value.length > 1 ? statusesLogic.value : null,
     }).forEach(([key, value]) => {
       if (value) {
         url.searchParams.set(key, value);
@@ -131,43 +192,67 @@ emitter?.on("filterRoms", onFilterChange);
 const filters = [
   {
     label: t("platform.genre"),
-    selected: selectedGenre,
+    selected: selectedGenres,
     items: filterGenres,
+    logic: genresLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setGenresLogic(logic),
   },
   {
     label: t("platform.franchise"),
-    selected: selectedFranchise,
+    selected: selectedFranchises,
     items: filterFranchises,
+    logic: franchisesLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setFranchisesLogic(logic),
   },
   {
     label: t("platform.collection"),
-    selected: selectedCollection,
+    selected: selectedCollections,
     items: filterCollections,
+    logic: collectionsLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setCollectionsLogic(logic),
   },
   {
     label: t("platform.company"),
-    selected: selectedCompany,
+    selected: selectedCompanies,
     items: filterCompanies,
+    logic: companiesLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setCompaniesLogic(logic),
   },
   {
     label: t("platform.age-rating"),
-    selected: selectedAgeRating,
+    selected: selectedAgeRatings,
     items: filterAgeRatings,
+    logic: ageRatingsLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setAgeRatingsLogic(logic),
   },
   {
     label: t("platform.region"),
-    selected: selectedRegion,
+    selected: selectedRegions,
     items: filterRegions,
+    logic: regionsLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setRegionsLogic(logic),
   },
   {
     label: t("platform.language"),
-    selected: selectedLanguage,
+    selected: selectedLanguages,
     items: filterLanguages,
+    logic: languagesLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setLanguagesLogic(logic),
   },
   {
     label: t("platform.status"),
-    selected: selectedStatus,
+    selected: selectedStatuses,
     items: filterStatuses,
+    logic: statusesLogic,
+    setLogic: (logic: "any" | "all") =>
+      galleryFilterStore.setStatusesLogic(logic),
   },
 ];
 
@@ -185,38 +270,47 @@ let searchFilteredRoms = ref<SimpleRom[]>([]);
 
 async function fetchSearchFilteredRoms() {
   try {
+    const params = {
+      searchTerm: searchTerm.value,
+      platformId: romsStore.currentPlatform?.id ?? null,
+      collectionId: romsStore.currentCollection?.id ?? null,
+      virtualCollectionId: romsStore.currentVirtualCollection?.id ?? null,
+      smartCollectionId: romsStore.currentSmartCollection?.id ?? null,
+      limit: romsStore.fetchLimit,
+      offset: romsStore.fetchOffset,
+      orderBy: romsStore.orderBy,
+      orderDir: romsStore.orderDir,
+      // Exclude all other filters
+      filterUnmatched: false,
+      filterMatched: false,
+      filterFavorites: null,
+      filterDuplicates: null,
+      filterPlayables: null,
+      filterRA: null,
+      filterMissing: null,
+      filterVerified: null,
+      // Single value filters - exclude
+      selectedGenre: null,
+      selectedFranchise: null,
+      selectedCollection: null,
+      selectedCompany: null,
+      selectedAgeRating: null,
+      selectedRegion: null,
+      selectedLanguage: null,
+      selectedStatus: null,
+      // Multi-value filters - exclude
+      selectedGenres: null,
+      selectedFranchises: null,
+      selectedCollections: null,
+      selectedCompanies: null,
+      selectedAgeRatings: null,
+      selectedRegions: null,
+      selectedLanguages: null,
+    };
+
     // Fetch ROMs with only search term applied (and current platform/collection context)
-    const response = await cachedApiService.getRoms(
-      {
-        searchTerm: searchTerm.value,
-        platformId: romsStore.currentPlatform?.id ?? null,
-        collectionId: romsStore.currentCollection?.id ?? null,
-        virtualCollectionId: romsStore.currentVirtualCollection?.id ?? null,
-        smartCollectionId: romsStore.currentSmartCollection?.id ?? null,
-        limit: romsStore.fetchLimit,
-        offset: romsStore.fetchOffset,
-        orderBy: romsStore.orderBy,
-        orderDir: romsStore.orderDir,
-        // Exclude all other filters
-        filterUnmatched: false,
-        filterMatched: false,
-        filterFavorites: null,
-        filterDuplicates: null,
-        filterPlayables: null,
-        filterRA: null,
-        filterMissing: null,
-        filterVerified: null,
-        selectedGenre: null,
-        selectedFranchise: null,
-        selectedCollection: null,
-        selectedCompany: null,
-        selectedAgeRating: null,
-        selectedRegion: null,
-        selectedLanguage: null,
-        selectedStatus: null,
-      },
-      () => {}, // No background update callback needed
-    );
+    const response = await cachedApiService.getRoms(params, () => {}); // No background update callback needed
+
     searchFilteredRoms.value = response.data.items;
   } catch (error) {
     console.error("Failed to fetch search-filtered ROMs:", error);
@@ -280,6 +374,7 @@ onMounted(async () => {
     filterVerified: urlFilteredVerified,
     filterRA: urlFilteredRa,
     platform: urlPlatform,
+    // Single value URL params (backward compatibility)
     genre: urlGenre,
     franchise: urlFranchise,
     collection: urlCollection,
@@ -288,6 +383,23 @@ onMounted(async () => {
     region: urlRegion,
     language: urlLanguage,
     status: urlStatus,
+    // Multi-value URL params
+    genres: urlGenres,
+    genresLogic: urlGenresLogic,
+    franchises: urlFranchises,
+    franchisesLogic: urlFranchisesLogic,
+    collections: urlCollections,
+    collectionsLogic: urlCollectionsLogic,
+    companies: urlCompanies,
+    companiesLogic: urlCompaniesLogic,
+    ageRatings: urlAgeRatings,
+    ageRatingsLogic: urlAgeRatingsLogic,
+    regions: urlRegions,
+    regionsLogic: urlRegionsLogic,
+    languages: urlLanguages,
+    languagesLogic: urlLanguagesLogic,
+    statuses: urlStatuses,
+    statusesLogic: urlStatusesLogic,
   } = router.currentRoute.value.query;
 
   // Check for query params to set filters
@@ -319,29 +431,102 @@ onMounted(async () => {
     const platform = platformsStore.get(Number(urlPlatform));
     if (platform) galleryFilterStore.setSelectedFilterPlatform(platform);
   }
-  if (urlGenre !== undefined) {
-    galleryFilterStore.setSelectedFilterGenre(urlGenre as string);
+  // Check for query params to set multi-value filters (prioritize over single values)
+  if (urlGenres !== undefined) {
+    const genres = (urlGenres as string).split(",").filter((g) => g.trim());
+    galleryFilterStore.setSelectedFilterGenres(genres);
+    if (urlGenresLogic !== undefined) {
+      galleryFilterStore.setGenresLogic(urlGenresLogic as "any" | "all");
+    }
+  } else if (urlGenre !== undefined) {
+    // Backward compatibility: if single genre is set, convert to multiselect
+    galleryFilterStore.setSelectedFilterGenres([urlGenre as string]);
   }
-  if (urlFranchise !== undefined) {
-    galleryFilterStore.setSelectedFilterFranchise(urlFranchise as string);
+
+  if (urlFranchises !== undefined) {
+    const franchises = (urlFranchises as string)
+      .split(",")
+      .filter((f) => f.trim());
+    galleryFilterStore.setSelectedFilterFranchises(franchises);
+    if (urlFranchisesLogic !== undefined) {
+      galleryFilterStore.setFranchisesLogic(
+        urlFranchisesLogic as "any" | "all",
+      );
+    }
+  } else if (urlFranchise !== undefined) {
+    galleryFilterStore.setSelectedFilterFranchises([urlFranchise as string]);
   }
-  if (urlCollection !== undefined) {
-    galleryFilterStore.setSelectedFilterCollection(urlCollection as string);
+
+  if (urlCollections !== undefined) {
+    const collections = (urlCollections as string)
+      .split(",")
+      .filter((c) => c.trim());
+    galleryFilterStore.setSelectedFilterCollections(collections);
+    if (urlCollectionsLogic !== undefined) {
+      galleryFilterStore.setCollectionsLogic(
+        urlCollectionsLogic as "any" | "all",
+      );
+    }
+  } else if (urlCollection !== undefined) {
+    galleryFilterStore.setSelectedFilterCollections([urlCollection as string]);
   }
-  if (urlCompany !== undefined) {
-    galleryFilterStore.setSelectedFilterCompany(urlCompany as string);
+
+  if (urlCompanies !== undefined) {
+    const companies = (urlCompanies as string)
+      .split(",")
+      .filter((c) => c.trim());
+    galleryFilterStore.setSelectedFilterCompanies(companies);
+    if (urlCompaniesLogic !== undefined) {
+      galleryFilterStore.setCompaniesLogic(urlCompaniesLogic as "any" | "all");
+    }
+  } else if (urlCompany !== undefined) {
+    galleryFilterStore.setSelectedFilterCompanies([urlCompany as string]);
   }
-  if (urlAgeRating !== undefined) {
-    galleryFilterStore.setSelectedFilterAgeRating(urlAgeRating as string);
+
+  if (urlAgeRatings !== undefined) {
+    const ageRatings = (urlAgeRatings as string)
+      .split(",")
+      .filter((a) => a.trim());
+    galleryFilterStore.setSelectedFilterAgeRatings(ageRatings);
+    if (urlAgeRatingsLogic !== undefined) {
+      galleryFilterStore.setAgeRatingsLogic(
+        urlAgeRatingsLogic as "any" | "all",
+      );
+    }
+  } else if (urlAgeRating !== undefined) {
+    galleryFilterStore.setSelectedFilterAgeRatings([urlAgeRating as string]);
   }
-  if (urlRegion !== undefined) {
-    galleryFilterStore.setSelectedFilterRegion(urlRegion as string);
+
+  if (urlRegions !== undefined) {
+    const regions = (urlRegions as string).split(",").filter((r) => r.trim());
+    galleryFilterStore.setSelectedFilterRegions(regions);
+    if (urlRegionsLogic !== undefined) {
+      galleryFilterStore.setRegionsLogic(urlRegionsLogic as "any" | "all");
+    }
+  } else if (urlRegion !== undefined) {
+    galleryFilterStore.setSelectedFilterRegions([urlRegion as string]);
   }
-  if (urlLanguage !== undefined) {
-    galleryFilterStore.setSelectedFilterLanguage(urlLanguage as string);
+
+  if (urlLanguages !== undefined) {
+    const languages = (urlLanguages as string)
+      .split(",")
+      .filter((l) => l.trim());
+    galleryFilterStore.setSelectedFilterLanguages(languages);
+    if (urlLanguagesLogic !== undefined) {
+      galleryFilterStore.setLanguagesLogic(urlLanguagesLogic as "any" | "all");
+    }
+  } else if (urlLanguage !== undefined) {
+    galleryFilterStore.setSelectedFilterLanguages([urlLanguage as string]);
   }
-  if (urlStatus !== undefined) {
-    galleryFilterStore.setSelectedFilterStatus(urlStatus as string);
+
+  if (urlStatuses !== undefined) {
+    const statuses = (urlStatuses as string).split(",").filter((s) => s.trim());
+    galleryFilterStore.setSelectedFilterStatuses(statuses);
+    if (urlStatusesLogic !== undefined) {
+      galleryFilterStore.setStatusesLogic(urlStatusesLogic as "any" | "all");
+    }
+  } else if (urlStatus !== undefined) {
+    galleryFilterStore.setSelectedFilterStatuses([urlStatus as string]);
   }
 
   // Check if search term is set in the URL (empty string is ok)
@@ -429,12 +614,16 @@ onMounted(async () => {
         v-for="filter in filters"
         :key="filter.label"
         :tabindex="activeFilterDrawer ? 0 : -1"
+        class="py-2"
       >
         <v-select
           v-model="filter.selected.value"
           :tabindex="activeFilterDrawer ? 0 : -1"
           hide-details
           clearable
+          multiple
+          chips
+          closable-chips
           :label="filter.label"
           variant="outlined"
           density="comfortable"
@@ -443,6 +632,24 @@ onMounted(async () => {
             nextTick(() => emitter?.emit('filterRoms', null))
           "
         />
+        <!-- AND/OR Logic Toggle -->
+        <v-btn-toggle
+          v-if="filter.selected.value.length > 1"
+          :model-value="filter.logic.value"
+          mandatory
+          variant="outlined"
+          density="compact"
+          class="mt-2"
+          @update:model-value="
+            (value) => {
+              filter.setLogic(value);
+              nextTick(() => emitter?.emit('filterRoms', null));
+            }
+          "
+        >
+          <v-btn value="any" size="small">{{ t("common.filter.any") }}</v-btn>
+          <v-btn value="all" size="small">{{ t("common.filter.all") }}</v-btn>
+        </v-btn-toggle>
       </v-list-item>
       <v-list-item
         class="justify-center d-flex"
diff --git a/frontend/src/locales/en_GB/common.json b/frontend/src/locales/en_GB/common.json
index d78d37940..c6857227c 100644
--- a/frontend/src/locales/en_GB/common.json
+++ b/frontend/src/locales/en_GB/common.json
@@ -57,5 +57,9 @@
   "username-length": "Username must be between 3 and 255 characters",
   "virtual-collection": "Autogenerated collection",
   "virtual-collections": "Autogenerated collections",
-  "warning": "WARNING:"
+  "warning": "WARNING:",
+  "filter": {
+    "any": "Any",
+    "all": "All"
+  }
 }
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 48fe7cb34..5ba10cf07 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -79,6 +79,7 @@ export interface GetRomsParams {
   filterMissing?: boolean | null;
   filterVerified?: boolean | null;
   groupByMetaId?: boolean;
+  // Single value filters (for backward compatibility)
   selectedGenre?: string | null;
   selectedFranchise?: string | null;
   selectedCollection?: string | null;
@@ -87,6 +88,23 @@ export interface GetRomsParams {
   selectedStatus?: string | null;
   selectedRegion?: string | null;
   selectedLanguage?: string | null;
+  // Multi-value filters
+  selectedGenres?: string[] | null;
+  selectedFranchises?: string[] | null;
+  selectedCollections?: string[] | null;
+  selectedCompanies?: string[] | null;
+  selectedAgeRatings?: string[] | null;
+  selectedRegions?: string[] | null;
+  selectedLanguages?: string[] | null;
+  selectedStatuses?: string[] | null;
+  // Logic operators for multi-value filters
+  genresLogic?: string | null;
+  franchisesLogic?: string | null;
+  collectionsLogic?: string | null;
+  companiesLogic?: string | null;
+  ageRatingsLogic?: string | null;
+  regionsLogic?: string | null;
+  languagesLogic?: string | null;
 }
 
 async function getRoms({
@@ -116,36 +134,93 @@ async function getRoms({
   selectedStatus = null,
   selectedRegion = null,
   selectedLanguage = null,
+  selectedGenres = null,
+  selectedFranchises = null,
+  selectedCollections = null,
+  selectedCompanies = null,
+  selectedAgeRatings = null,
+  selectedRegions = null,
+  selectedLanguages = null,
+  selectedStatuses = null,
+  // Logic operators
+  genresLogic = null,
+  franchisesLogic = null,
+  collectionsLogic = null,
+  companiesLogic = null,
+  ageRatingsLogic = null,
+  regionsLogic = null,
+  languagesLogic = null,
 }: GetRomsParams): Promise<{ data: GetRomsResponse }> {
+  // Helper function to handle single vs multi-value parameters
+  const getFilterArray = (
+    single: string | null,
+    multi: string[] | null,
+  ): string[] | undefined => {
+    if (multi && multi.length > 0) return multi;
+    if (single) return [single];
+    return undefined;
+  };
+
+  const params = {
+    platform_id: platformId,
+    collection_id: collectionId,
+    virtual_collection_id: virtualCollectionId,
+    smart_collection_id: smartCollectionId,
+    search_term: searchTerm,
+    limit: limit,
+    offset: offset,
+    order_by: orderBy,
+    order_dir: orderDir,
+    group_by_meta_id: groupByMetaId,
+    genre: getFilterArray(selectedGenre, selectedGenres),
+    franchise: getFilterArray(selectedFranchise, selectedFranchises),
+    collection: getFilterArray(selectedCollection, selectedCollections),
+    company: getFilterArray(selectedCompany, selectedCompanies),
+    age_rating: getFilterArray(selectedAgeRating, selectedAgeRatings),
+    selected_status: getStatusKeyForText(selectedStatus),
+    region: getFilterArray(selectedRegion, selectedRegions),
+    language: getFilterArray(selectedLanguage, selectedLanguages),
+    // Logic operators
+    genres_logic:
+      selectedGenres && selectedGenres.length > 1
+        ? genresLogic || "any"
+        : undefined,
+    franchises_logic:
+      selectedFranchises && selectedFranchises.length > 1
+        ? franchisesLogic || "any"
+        : undefined,
+    collections_logic:
+      selectedCollections && selectedCollections.length > 1
+        ? collectionsLogic || "any"
+        : undefined,
+    companies_logic:
+      selectedCompanies && selectedCompanies.length > 1
+        ? companiesLogic || "any"
+        : undefined,
+    age_ratings_logic:
+      selectedAgeRatings && selectedAgeRatings.length > 1
+        ? ageRatingsLogic || "any"
+        : undefined,
+    regions_logic:
+      selectedRegions && selectedRegions.length > 1
+        ? regionsLogic || "any"
+        : undefined,
+    languages_logic:
+      selectedLanguages && selectedLanguages.length > 1
+        ? languagesLogic || "any"
+        : undefined,
+    ...(filterUnmatched ? { matched: false } : {}),
+    ...(filterMatched ? { matched: true } : {}),
+    ...(filterFavorites !== null ? { favorite: filterFavorites } : {}),
+    ...(filterDuplicates !== null ? { duplicate: filterDuplicates } : {}),
+    ...(filterPlayables !== null ? { playable: filterPlayables } : {}),
+    ...(filterMissing !== null ? { missing: filterMissing } : {}),
+    ...(filterRA !== null ? { has_ra: filterRA } : {}),
+    ...(filterVerified !== null ? { verified: filterVerified } : {}),
+  };
+
   return api.get(`/roms`, {
-    params: {
-      platform_id: platformId,
-      collection_id: collectionId,
-      virtual_collection_id: virtualCollectionId,
-      smart_collection_id: smartCollectionId,
-      search_term: searchTerm,
-      limit: limit,
-      offset: offset,
-      order_by: orderBy,
-      order_dir: orderDir,
-      group_by_meta_id: groupByMetaId,
-      genre: selectedGenre ? [selectedGenre] : undefined,
-      franchise: selectedFranchise ? [selectedFranchise] : undefined,
-      collection: selectedCollection ? [selectedCollection] : undefined,
-      company: selectedCompany ? [selectedCompany] : undefined,
-      age_rating: selectedAgeRating ? [selectedAgeRating] : undefined,
-      selected_status: getStatusKeyForText(selectedStatus),
-      region: selectedRegion ? [selectedRegion] : undefined,
-      language: selectedLanguage ? [selectedLanguage] : undefined,
-      ...(filterUnmatched ? { matched: false } : {}),
-      ...(filterMatched ? { matched: true } : {}),
-      ...(filterFavorites !== null ? { favorite: filterFavorites } : {}),
-      ...(filterDuplicates !== null ? { duplicate: filterDuplicates } : {}),
-      ...(filterPlayables !== null ? { playable: filterPlayables } : {}),
-      ...(filterMissing !== null ? { missing: filterMissing } : {}),
-      ...(filterRA !== null ? { has_ra: filterRA } : {}),
-      ...(filterVerified !== null ? { verified: filterVerified } : {}),
-    },
+    params,
   });
 }
 
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index 4ad9cfa38..aaa2462e7 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -11,6 +11,22 @@ import cacheService from "@/services/cache";
 import { getStatusKeyForText } from "@/utils";
 
 class CachedApiService {
+  // Helper function to handle single vs multi-value parameters
+  private getFilterArray(
+    single: string | null | undefined,
+    multi: string[] | null | undefined,
+  ): string[] | undefined {
+    const result = (() => {
+      if (multi && multi.length > 0) return multi;
+      if (single) return [single];
+      return undefined;
+    })();
+    // Only log non-empty results to reduce console noise
+    if (result) {
+      console.log("CachedApiService getFilterArray - result:", result);
+    }
+    return result;
+  }
   private createRequestConfig(
     method: Method,
     url: string,
@@ -40,20 +56,61 @@ class CachedApiService {
       order_by: params.orderBy,
       order_dir: params.orderDir,
       group_by_meta_id: params.groupByMetaId,
-      genre: params.selectedGenre ? [params.selectedGenre] : undefined,
-      franchise: params.selectedFranchise
-        ? [params.selectedFranchise]
-        : undefined,
-      collection: params.selectedCollection
-        ? [params.selectedCollection]
-        : undefined,
-      company: params.selectedCompany ? [params.selectedCompany] : undefined,
-      age_rating: params.selectedAgeRating
-        ? [params.selectedAgeRating]
-        : undefined,
+      genre: this.getFilterArray(params.selectedGenre, params.selectedGenres),
+      franchise: this.getFilterArray(
+        params.selectedFranchise,
+        params.selectedFranchises,
+      ),
+      collection: this.getFilterArray(
+        params.selectedCollection,
+        params.selectedCollections,
+      ),
+      company: this.getFilterArray(
+        params.selectedCompany,
+        params.selectedCompanies,
+      ),
+      age_rating: this.getFilterArray(
+        params.selectedAgeRating,
+        params.selectedAgeRatings,
+      ),
       selected_status: getStatusKeyForText(params.selectedStatus ?? null),
-      region: params.selectedRegion ? [params.selectedRegion] : undefined,
-      language: params.selectedLanguage ? [params.selectedLanguage] : undefined,
+      region: this.getFilterArray(
+        params.selectedRegion,
+        params.selectedRegions,
+      ),
+      language: this.getFilterArray(
+        params.selectedLanguage,
+        params.selectedLanguages,
+      ),
+      // Logic operators
+      genres_logic:
+        params.selectedGenres && params.selectedGenres.length > 1
+          ? params.genresLogic || "any"
+          : undefined,
+      franchises_logic:
+        params.selectedFranchises && params.selectedFranchises.length > 1
+          ? params.franchisesLogic || "any"
+          : undefined,
+      collections_logic:
+        params.selectedCollections && params.selectedCollections.length > 1
+          ? params.collectionsLogic || "any"
+          : undefined,
+      companies_logic:
+        params.selectedCompanies && params.selectedCompanies.length > 1
+          ? params.companiesLogic || "any"
+          : undefined,
+      age_ratings_logic:
+        params.selectedAgeRatings && params.selectedAgeRatings.length > 1
+          ? params.ageRatingsLogic || "any"
+          : undefined,
+      regions_logic:
+        params.selectedRegions && params.selectedRegions.length > 1
+          ? params.regionsLogic || "any"
+          : undefined,
+      languages_logic:
+        params.selectedLanguages && params.selectedLanguages.length > 1
+          ? params.languagesLogic || "any"
+          : undefined,
       ...(params.filterUnmatched ? { matched: false } : {}),
       ...(params.filterMatched ? { matched: true } : {}),
       ...(params.filterFavorites !== null
diff --git a/frontend/src/stores/galleryFilter.ts b/frontend/src/stores/galleryFilter.ts
index 0863ff8f0..c9dc94b4d 100644
--- a/frontend/src/stores/galleryFilter.ts
+++ b/frontend/src/stores/galleryFilter.ts
@@ -35,14 +35,33 @@ const defaultFilterState = {
   filterMissing: null as boolean | null, // null = all, true = missing, false = not missing
   filterVerified: null as boolean | null, // null = all, true = verified, false = not verified
   selectedPlatform: null as Platform | null,
+  selectedPlatforms: [] as Platform[],
   selectedGenre: null as string | null,
+  selectedGenres: [] as string[],
   selectedFranchise: null as string | null,
+  selectedFranchises: [] as string[],
   selectedCollection: null as string | null,
+  selectedCollections: [] as string[],
   selectedCompany: null as string | null,
+  selectedCompanies: [] as string[],
   selectedAgeRating: null as string | null,
+  selectedAgeRatings: [] as string[],
   selectedRegion: null as string | null,
+  selectedRegions: [] as string[],
   selectedLanguage: null as string | null,
+  selectedLanguages: [] as string[],
   selectedStatus: null as string | null,
+  selectedStatuses: [] as string[],
+  // Logic operators for multi-select filters
+  platformsLogic: "any" as "any" | "all",
+  genresLogic: "any" as "any" | "all",
+  franchisesLogic: "any" as "any" | "all",
+  collectionsLogic: "any" as "any" | "all",
+  companiesLogic: "any" as "any" | "all",
+  ageRatingsLogic: "any" as "any" | "all",
+  regionsLogic: "any" as "any" | "all",
+  languagesLogic: "any" as "any" | "all",
+  statusesLogic: "any" as "any" | "all",
 };
 
 export default defineStore("galleryFilter", {
@@ -81,30 +100,84 @@ export default defineStore("galleryFilter", {
         ? this.filterPlatforms.find((p) => p.id === platform.id) || null
         : null;
     },
+    setSelectedFilterPlatforms(platforms: Platform[]) {
+      this.selectedPlatforms = platforms;
+    },
+    setPlatformsLogic(logic: "any" | "all") {
+      this.platformsLogic = logic;
+    },
     setSelectedFilterGenre(genre: string) {
       this.selectedGenre = genre;
     },
+    setSelectedFilterGenres(genres: string[]) {
+      this.selectedGenres = genres;
+    },
+    setGenresLogic(logic: "any" | "all") {
+      this.genresLogic = logic;
+    },
     setSelectedFilterFranchise(franchise: string) {
       this.selectedFranchise = franchise;
     },
+    setSelectedFilterFranchises(franchises: string[]) {
+      this.selectedFranchises = franchises;
+    },
+    setFranchisesLogic(logic: "any" | "all") {
+      this.franchisesLogic = logic;
+    },
     setSelectedFilterCollection(collection: string) {
       this.selectedCollection = collection;
     },
+    setSelectedFilterCollections(collections: string[]) {
+      this.selectedCollections = collections;
+    },
+    setCollectionsLogic(logic: "any" | "all") {
+      this.collectionsLogic = logic;
+    },
     setSelectedFilterCompany(company: string) {
       this.selectedCompany = company;
     },
+    setSelectedFilterCompanies(companies: string[]) {
+      this.selectedCompanies = companies;
+    },
+    setCompaniesLogic(logic: "any" | "all") {
+      this.companiesLogic = logic;
+    },
     setSelectedFilterAgeRating(ageRating: string) {
       this.selectedAgeRating = ageRating;
     },
+    setSelectedFilterAgeRatings(ageRatings: string[]) {
+      this.selectedAgeRatings = ageRatings;
+    },
+    setAgeRatingsLogic(logic: "any" | "all") {
+      this.ageRatingsLogic = logic;
+    },
     setSelectedFilterRegion(region: string) {
       this.selectedRegion = region;
     },
+    setSelectedFilterRegions(regions: string[]) {
+      this.selectedRegions = regions;
+    },
+    setRegionsLogic(logic: "any" | "all") {
+      this.regionsLogic = logic;
+    },
     setSelectedFilterLanguage(language: string) {
       this.selectedLanguage = language;
     },
+    setSelectedFilterLanguages(languages: string[]) {
+      this.selectedLanguages = languages;
+    },
+    setLanguagesLogic(logic: "any" | "all") {
+      this.languagesLogic = logic;
+    },
     setSelectedFilterStatus(status: string) {
       this.selectedStatus = status;
     },
+    setSelectedFilterStatuses(statuses: string[]) {
+      this.selectedStatuses = statuses;
+    },
+    setStatusesLogic(logic: "any" | "all") {
+      this.statusesLogic = logic;
+    },
     setFilterUnmatched(value: boolean) {
       this.filterUnmatched = value;
       this.filterMatched = false;
@@ -282,14 +355,23 @@ export default defineStore("galleryFilter", {
           this.filterMissing !== null ||
           this.filterVerified !== null ||
           this.selectedPlatform ||
+          this.selectedPlatforms.length > 0 ||
           this.selectedGenre ||
+          this.selectedGenres.length > 0 ||
           this.selectedFranchise ||
+          this.selectedFranchises.length > 0 ||
           this.selectedCollection ||
+          this.selectedCollections.length > 0 ||
           this.selectedCompany ||
+          this.selectedCompanies.length > 0 ||
           this.selectedAgeRating ||
+          this.selectedAgeRatings.length > 0 ||
           this.selectedRegion ||
+          this.selectedRegions.length > 0 ||
           this.selectedLanguage ||
-          this.selectedStatus,
+          this.selectedLanguages.length > 0 ||
+          this.selectedStatus ||
+          this.selectedStatuses.length > 0,
       );
     },
     reset() {
@@ -297,14 +379,23 @@ export default defineStore("galleryFilter", {
     },
     resetFilters() {
       this.selectedPlatform = null;
+      this.selectedPlatforms = [];
       this.selectedGenre = null;
+      this.selectedGenres = [];
       this.selectedFranchise = null;
+      this.selectedFranchises = [];
       this.selectedCollection = null;
+      this.selectedCollections = [];
       this.selectedCompany = null;
+      this.selectedCompanies = [];
       this.selectedAgeRating = null;
+      this.selectedAgeRatings = [];
       this.selectedRegion = null;
+      this.selectedRegions = [];
       this.selectedLanguage = null;
+      this.selectedLanguages = [];
       this.selectedStatus = null;
+      this.selectedStatuses = [];
       this.filterUnmatched = false;
       this.filterMatched = false;
       this.filterFavorites = null;
@@ -313,6 +404,16 @@ export default defineStore("galleryFilter", {
       this.filterRA = null;
       this.filterMissing = null;
       this.filterVerified = null;
+      // Reset logic operators to default
+      this.platformsLogic = "any";
+      this.genresLogic = "any";
+      this.franchisesLogic = "any";
+      this.collectionsLogic = "any";
+      this.companiesLogic = "any";
+      this.ageRatingsLogic = "any";
+      this.regionsLogic = "any";
+      this.languagesLogic = "any";
+      this.statusesLogic = "any";
     },
   },
 });
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index ca221352f..a10d51288 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -96,8 +96,8 @@ export default defineStore("roms", {
     },
     // Fetching multiple roms
     _buildRequestParams(galleryFilter: GalleryFilterStore) {
-      return {
-        ...galleryFilter.$state,
+      const params = {
+        searchTerm: galleryFilter.searchTerm,
         platformId:
           this.currentPlatform?.id ??
           galleryFilter.selectedPlatform?.id ??
@@ -110,7 +110,90 @@ export default defineStore("roms", {
         orderBy: this.orderBy,
         orderDir: this.orderDir,
         groupByMetaId: this._shouldGroupRoms() && this.onGalleryView,
+        filterUnmatched: galleryFilter.filterUnmatched,
+        filterMatched: galleryFilter.filterMatched,
+        filterFavorites: galleryFilter.filterFavorites,
+        filterDuplicates: galleryFilter.filterDuplicates,
+        filterPlayables: galleryFilter.filterPlayables,
+        filterRA: galleryFilter.filterRA,
+        filterMissing: galleryFilter.filterMissing,
+        filterVerified: galleryFilter.filterVerified,
+        // Single value filters (backward compatibility - only use if multiselect is empty)
+        selectedGenre:
+          galleryFilter.selectedGenres.length > 0
+            ? null
+            : galleryFilter.selectedGenre,
+        selectedFranchise:
+          galleryFilter.selectedFranchises.length > 0
+            ? null
+            : galleryFilter.selectedFranchise,
+        selectedCollection:
+          galleryFilter.selectedCollections.length > 0
+            ? null
+            : galleryFilter.selectedCollection,
+        selectedCompany:
+          galleryFilter.selectedCompanies.length > 0
+            ? null
+            : galleryFilter.selectedCompany,
+        selectedAgeRating:
+          galleryFilter.selectedAgeRatings.length > 0
+            ? null
+            : galleryFilter.selectedAgeRating,
+        selectedStatus:
+          galleryFilter.selectedStatuses.length > 0
+            ? null
+            : galleryFilter.selectedStatus,
+        selectedRegion:
+          galleryFilter.selectedRegions.length > 0
+            ? null
+            : galleryFilter.selectedRegion,
+        selectedLanguage:
+          galleryFilter.selectedLanguages.length > 0
+            ? null
+            : galleryFilter.selectedLanguage,
+        // Multi-value filters
+        selectedGenres:
+          galleryFilter.selectedGenres.length > 0
+            ? galleryFilter.selectedGenres
+            : null,
+        selectedFranchises:
+          galleryFilter.selectedFranchises.length > 0
+            ? galleryFilter.selectedFranchises
+            : null,
+        selectedCollections:
+          galleryFilter.selectedCollections.length > 0
+            ? galleryFilter.selectedCollections
+            : null,
+        selectedCompanies:
+          galleryFilter.selectedCompanies.length > 0
+            ? galleryFilter.selectedCompanies
+            : null,
+        selectedAgeRatings:
+          galleryFilter.selectedAgeRatings.length > 0
+            ? galleryFilter.selectedAgeRatings
+            : null,
+        selectedRegions:
+          galleryFilter.selectedRegions.length > 0
+            ? galleryFilter.selectedRegions
+            : null,
+        selectedLanguages:
+          galleryFilter.selectedLanguages.length > 0
+            ? galleryFilter.selectedLanguages
+            : null,
+        selectedStatuses:
+          galleryFilter.selectedStatuses.length > 0
+            ? galleryFilter.selectedStatuses
+            : null,
+        // Logic operators
+        genresLogic: galleryFilter.genresLogic,
+        franchisesLogic: galleryFilter.franchisesLogic,
+        collectionsLogic: galleryFilter.collectionsLogic,
+        companiesLogic: galleryFilter.companiesLogic,
+        ageRatingsLogic: galleryFilter.ageRatingsLogic,
+        regionsLogic: galleryFilter.regionsLogic,
+        languagesLogic: galleryFilter.languagesLogic,
       };
+      return params;
     },
     _postFetchRoms(response: GetRomsResponse, concat: boolean) {
       const { items, offset, total, char_index, rom_id_index } = response;

From 9a8833994612bd51f7f4c423251ba68d5bcef4cf Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 19:24:46 +0000
Subject: [PATCH 09/73] Enhance filter button tooltips with open delay for
 improved user experience

---
 .../AppBar/common/FilterDrawer/Base.vue       | 90 ++++++++++++-------
 .../FilterDrawer/FilterDuplicatesBtn.vue      | 12 ++-
 .../FilterDrawer/FilterFavoritesBtn.vue       | 12 ++-
 .../FilterDrawer/FilterMatchStateBtn.vue      | 12 ++-
 .../common/FilterDrawer/FilterMissingBtn.vue  | 14 ++-
 .../FilterDrawer/FilterPlayablesBtn.vue       | 12 ++-
 .../common/FilterDrawer/FilterRaBtn.vue       |  7 +-
 .../common/FilterDrawer/FilterVerifiedBtn.vue | 14 ++-
 8 files changed, 124 insertions(+), 49 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index e42481774..21aaa2d6e 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -616,40 +616,62 @@ onMounted(async () => {
         :tabindex="activeFilterDrawer ? 0 : -1"
         class="py-2"
       >
-        <v-select
-          v-model="filter.selected.value"
-          :tabindex="activeFilterDrawer ? 0 : -1"
-          hide-details
-          clearable
-          multiple
-          chips
-          closable-chips
-          :label="filter.label"
-          variant="outlined"
-          density="comfortable"
-          :items="filter.items.value"
-          @update:model-value="
-            nextTick(() => emitter?.emit('filterRoms', null))
-          "
-        />
-        <!-- AND/OR Logic Toggle -->
-        <v-btn-toggle
-          v-if="filter.selected.value.length > 1"
-          :model-value="filter.logic.value"
-          mandatory
-          variant="outlined"
-          density="compact"
-          class="mt-2"
-          @update:model-value="
-            (value) => {
-              filter.setLogic(value);
-              nextTick(() => emitter?.emit('filterRoms', null));
-            }
-          "
-        >
-          <v-btn value="any" size="small">{{ t("common.filter.any") }}</v-btn>
-          <v-btn value="all" size="small">{{ t("common.filter.all") }}</v-btn>
-        </v-btn-toggle>
+        <div class="d-flex align-center ga-2 w-100">
+          <v-select
+            v-model="filter.selected.value"
+            :tabindex="activeFilterDrawer ? 0 : -1"
+            hide-details
+            clearable
+            multiple
+            chips
+            closable-chips
+            :label="filter.label"
+            variant="outlined"
+            density="comfortable"
+            :items="filter.items.value"
+            class="flex-grow-1"
+            @update:model-value="
+              nextTick(() => emitter?.emit('filterRoms', null))
+            "
+          />
+          <!-- AND/OR Logic Toggle - always visible -->
+          <v-btn-toggle
+            :model-value="filter.logic.value"
+            mandatory
+            variant="outlined"
+            density="compact"
+            class="flex-shrink-0"
+            @update:model-value="
+              (value) => {
+                filter.setLogic(value);
+                nextTick(() => emitter?.emit('filterRoms', null));
+              }
+            "
+          >
+            <v-tooltip
+              text="Match ANY of the selected values (OR logic)"
+              location="bottom"
+              open-delay="500"
+            >
+              <template #activator="{ props }">
+                <v-btn value="any" size="small" v-bind="props">
+                  <v-icon size="x-large">mdi-set-none</v-icon>
+                </v-btn>
+              </template>
+            </v-tooltip>
+            <v-tooltip
+              text="Match ALL of the selected values (AND logic)"
+              location="bottom"
+              open-delay="500"
+            >
+              <template #activator="{ props }">
+                <v-btn value="all" size="small" v-bind="props">
+                  <v-icon size="x-large">mdi-set-all</v-icon>
+                </v-btn>
+              </template>
+            </v-tooltip>
+          </v-btn-toggle>
+        </div>
       </v-list-item>
       <v-list-item
         class="justify-center d-flex"
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
index 6f79fe527..bee9fed31 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
@@ -67,7 +67,11 @@ function setState(state: string | null) {
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
-      <v-tooltip text="Show duplicate ROMs only" location="bottom">
+      <v-tooltip
+        text="Show duplicate ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn
             value="duplicates"
@@ -79,7 +83,11 @@ function setState(state: string | null) {
           </v-btn>
         </template>
       </v-tooltip>
-      <v-tooltip text="Show non-duplicate ROMs only" location="bottom">
+      <v-tooltip
+        text="Show non-duplicate ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn
             value="not-duplicates"
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
index b0368f775..65485468f 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
@@ -60,14 +60,22 @@ function setState(state: string | null) {
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
-      <v-tooltip text="Show favorite ROMs only" location="bottom">
+      <v-tooltip
+        text="Show favorite ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="favorites" size="small" v-bind="props">
             <v-icon size="x-large">mdi-star</v-icon>
           </v-btn>
         </template>
       </v-tooltip>
-      <v-tooltip text="Show non-favorite ROMs only" location="bottom">
+      <v-tooltip
+        text="Show non-favorite ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="not-favorites" size="small" v-bind="props">
             <v-icon size="x-large">mdi-star-outline</v-icon>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
index e0c4f4139..7bb97cce8 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
@@ -67,14 +67,22 @@ function setMatchState(state: string) {
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
-      <v-tooltip :text="t('platform.show-matched')" location="bottom">
+      <v-tooltip
+        :text="t('platform.show-matched')"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="matched" size="small" v-bind="props">
             <v-icon size="x-large">mdi-file-find</v-icon>
           </v-btn>
         </template>
       </v-tooltip>
-      <v-tooltip :text="t('platform.show-unmatched')" location="bottom">
+      <v-tooltip
+        :text="t('platform.show-unmatched')"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="unmatched" size="small" v-bind="props">
             <v-icon size="x-large">mdi-file-find-outline</v-icon>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
index e358d2b43..8fe22f69a 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
@@ -60,14 +60,22 @@ function setState(state: string | null) {
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
-      <v-tooltip text="Show missing ROMs only" location="bottom">
+      <v-tooltip
+        text="Show missing ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="missing" size="small" v-bind="props">
-            <v-icon size="x-large">mdi-folder-question</v-icon>
+            <v-icon size="x-large">mdi-file-question</v-icon>
           </v-btn>
         </template>
       </v-tooltip>
-      <v-tooltip text="Show non-missing ROMs only" location="bottom">
+      <v-tooltip
+        text="Show non-missing ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="not-missing" size="small" v-bind="props">
             <v-icon size="x-large">mdi-folder-check</v-icon>
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
index 469ea23e3..0002e0412 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
@@ -67,7 +67,11 @@ function setState(state: string | null) {
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
-      <v-tooltip text="Show playable ROMs only" location="bottom">
+      <v-tooltip
+        text="Show playable ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn
             value="playables"
@@ -79,7 +83,11 @@ function setState(state: string | null) {
           </v-btn>
         </template>
       </v-tooltip>
-      <v-tooltip text="Show non-playable ROMs only" location="bottom">
+      <v-tooltip
+        text="Show non-playable ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn
             value="not-playables"
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
index 5560353e8..4858fcd22 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
@@ -65,7 +65,11 @@ function setState(state: string | null) {
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
-      <v-tooltip text="Show ROMs with RetroAchievements only" location="bottom">
+      <v-tooltip
+        text="Show ROMs with RetroAchievements only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn
             value="has-ra"
@@ -80,6 +84,7 @@ function setState(state: string | null) {
       <v-tooltip
         text="Show ROMs without RetroAchievements only"
         location="bottom"
+        open-delay="500"
       >
         <template #activator="{ props }">
           <v-btn
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
index fd83b478c..1cb88db34 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
@@ -60,14 +60,22 @@ function setState(state: string | null) {
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
-      <v-tooltip text="Show verified ROMs only" location="bottom">
+      <v-tooltip
+        text="Show verified ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="verified" size="small" v-bind="props">
-            <v-icon size="x-large">mdi-check-decagram</v-icon>
+            <v-icon size="x-large">mdi-check</v-icon>
           </v-btn>
         </template>
       </v-tooltip>
-      <v-tooltip text="Show non-verified ROMs only" location="bottom">
+      <v-tooltip
+        text="Show non-verified ROMs only"
+        location="bottom"
+        open-delay="500"
+      >
         <template #activator="{ props }">
           <v-btn value="not-verified" size="small" v-bind="props">
             <v-icon size="x-large">mdi-check-decagram-outline</v-icon>

From 937ba5407761e62861bd6d36ac46f50b0c91a93e Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 19:55:28 +0000
Subject: [PATCH 10/73] Implement multi-value platform filtering with logic
 operators in ROMs API and frontend components

---
 backend/endpoints/rom.py                      |  32 ++++
 backend/handler/database/roms_handler.py      |  25 ++-
 .../common/FilterDrawer/FilterPlatformBtn.vue | 148 ++++++++++++------
 frontend/src/services/api/rom.ts              |  10 ++
 frontend/src/services/cache/api.ts            |   8 +
 frontend/src/stores/roms.ts                   |  13 +-
 6 files changed, 180 insertions(+), 56 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 2233408e4..b70d76c0c 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -205,6 +205,17 @@ def get_roms(
         int | None,
         Query(description="Platform internal id.", ge=1),
     ] = None,
+    platform_ids: Annotated[
+        list[int] | None,
+        Query(
+            description=(
+                "Platform internal ids. Multiple values are allowed by repeating the"
+                " parameter, and results that match any of the values will be"
+                " returned. Maximum 20 values allowed."
+            ),
+            max_length=20,
+        ),
+    ] = None,
     collection_id: Annotated[
         int | None,
         Query(description="Collection internal id.", ge=1),
@@ -350,6 +361,13 @@ def get_roms(
         Query(description="Order direction, either 'asc' or 'desc'."),
     ] = "asc",
     # Logic operators for multi-value filters
+    platforms_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for platforms filter: 'any' (OR) or 'all' (AND).",
+            alias="platforms_logic",
+        ),
+    ] = "any",
     genres_logic: Annotated[
         str,
         Query(
@@ -431,6 +449,18 @@ def get_roms(
             return None
 
     # Apply sanitization with specific limits and names
+    platform_ids = sanitize_filter_array(
+        [str(pid) for pid in platform_ids] if platform_ids else None, 20, "platform_ids"
+    )
+    # Convert back to integers and validate >= 1
+    if platform_ids:
+        try:
+            platform_ids = [int(pid) for pid in platform_ids if int(pid) >= 1]
+            if not platform_ids:
+                platform_ids = None
+        except (ValueError, TypeError):
+            platform_ids = None
+
     genres = sanitize_filter_array(genres, 50, "genres")
     franchises = sanitize_filter_array(franchises, 50, "franchises")
     collections = sanitize_filter_array(collections, 50, "collections")
@@ -451,6 +481,7 @@ def get_roms(
         query=query,
         user_id=request.user.id,
         platform_id=platform_id,
+        platform_ids=platform_ids,
         collection_id=collection_id,
         virtual_collection_id=virtual_collection_id,
         smart_collection_id=smart_collection_id,
@@ -471,6 +502,7 @@ def get_roms(
         regions=regions,
         languages=languages,
         # Logic operators
+        platforms_logic=platforms_logic,
         genres_logic=genres_logic,
         franchises_logic=franchises_logic,
         collections_logic=collections_logic,
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 494e32328..b8f6883f0 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -186,6 +186,22 @@ class DBRomsHandler(DBBaseHandler):
     def filter_by_platform_id(self, query: Query, platform_id: int):
         return query.filter(Rom.platform_id == platform_id)
 
+    def filter_by_platform_ids(
+        self,
+        query: Query,
+        platform_ids: Sequence[int],
+        match_all: bool = False,
+    ) -> Query:
+        if match_all:
+            # AND logic: This doesn't make sense for platforms since a ROM belongs to exactly one platform
+            # But we'll implement it for completeness - will return no results
+            for pid in platform_ids:
+                query = query.filter(Rom.platform_id == pid)
+            return query
+        else:
+            # OR logic: ROM belongs to any of the specified platforms
+            return query.filter(Rom.platform_id.in_(platform_ids))
+
     def filter_by_collection_id(
         self, query: Query, session: Session, collection_id: int
     ):
@@ -416,6 +432,7 @@ class DBRomsHandler(DBBaseHandler):
         self,
         query: Query,
         platform_id: int | None = None,
+        platform_ids: Sequence[int] | None = None,
         collection_id: int | None = None,
         virtual_collection_id: str | None = None,
         smart_collection_id: int | None = None,
@@ -437,6 +454,7 @@ class DBRomsHandler(DBBaseHandler):
         regions: Sequence[str] | None = None,
         languages: Sequence[str] | None = None,
         # Logic operators for multi-value filters
+        platforms_logic: str = "any",
         genres_logic: str = "any",
         franchises_logic: str = "any",
         collections_logic: str = "any",
@@ -449,7 +467,12 @@ class DBRomsHandler(DBBaseHandler):
     ) -> Query[Rom]:
         from handler.scan_handler import MetadataSource
 
-        if platform_id:
+        # Handle platform filtering with priority for multi-platform
+        if platform_ids:
+            query = self.filter_by_platform_ids(
+                query, platform_ids, match_all=(platforms_logic == "all")
+            )
+        elif platform_id:
             query = self.filter_by_platform_id(query, platform_id)
 
         if collection_id:
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
index 9416c4365..245c84a16 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
@@ -14,68 +14,112 @@ defineProps<{
 
 const { t } = useI18n();
 const galleryFilterStore = storeGalleryFilter();
-const { selectedPlatform, filterPlatforms } = storeToRefs(galleryFilterStore);
+const { selectedPlatforms, filterPlatforms, platformsLogic } =
+  storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
 </script>
 
 <template>
-  <v-select
-    v-model="selectedPlatform"
-    :tabindex="tabindex"
-    hide-details
-    :label="t('common.platform')"
-    clearable
-    variant="outlined"
-    density="comfortable"
-    :items="filterPlatforms"
-    @update:model-value="nextTick(() => emitter?.emit('filterRoms', null))"
-  >
-    <template #prepend-inner>
-      <v-icon class="ml-2 mr-1">mdi-controller</v-icon>
-    </template>
-    <template #item="{ props, item }">
-      <v-list-item
-        v-bind="props"
-        class="py-4"
-        :title="item.raw.name ?? ''"
-        :subtitle="item.raw.fs_slug"
-      >
-        <template #prepend>
+  <div class="d-flex align-center ga-2 w-100">
+    <v-select
+      v-model="selectedPlatforms"
+      :tabindex="tabindex"
+      hide-details
+      :label="t('common.platform')"
+      clearable
+      multiple
+      chips
+      closable-chips
+      variant="outlined"
+      density="comfortable"
+      :items="filterPlatforms"
+      class="flex-grow-1"
+      @update:model-value="nextTick(() => emitter?.emit('filterRoms', null))"
+    >
+      <template #prepend-inner>
+        <v-icon class="ml-2 mr-1">mdi-controller</v-icon>
+      </template>
+      <template #item="{ props, item }">
+        <v-list-item
+          v-bind="props"
+          class="py-4"
+          :title="item.raw.name ?? ''"
+          :subtitle="item.raw.fs_slug"
+        >
+          <template #prepend>
+            <PlatformIcon
+              :key="item.raw.slug"
+              :size="35"
+              :slug="item.raw.slug"
+              :name="item.raw.name"
+              :fs-slug="item.raw.fs_slug"
+            />
+          </template>
+          <template #append>
+            <MissingFromFSIcon
+              v-if="item.raw.missing_from_fs"
+              text="Missing platform from filesystem"
+              chip
+              chip-label
+              chip-density="compact"
+              class="ml-2"
+            />
+            <v-chip class="ml-2" size="x-small" label>
+              {{ item.raw.rom_count }}
+            </v-chip>
+          </template>
+        </v-list-item>
+      </template>
+      <template #chip="{ item }">
+        <v-chip>
           <PlatformIcon
             :key="item.raw.slug"
-            :size="35"
             :slug="item.raw.slug"
             :name="item.raw.name"
             :fs-slug="item.raw.fs_slug"
+            :size="20"
+            class="mr-2"
           />
+          {{ item.raw.name }}
+        </v-chip>
+      </template>
+    </v-select>
+    <!-- AND/OR Logic Toggle - always visible -->
+    <v-btn-toggle
+      :model-value="platformsLogic"
+      mandatory
+      variant="outlined"
+      density="compact"
+      class="flex-shrink-0"
+      @update:model-value="
+        (value) => {
+          galleryFilterStore.setPlatformsLogic(value);
+          nextTick(() => emitter?.emit('filterRoms', null));
+        }
+      "
+    >
+      <v-tooltip
+        text="Match ANY of the selected platforms (OR logic)"
+        location="bottom"
+        open-delay="500"
+      >
+        <template #activator="{ props }">
+          <v-btn value="any" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-set-none</v-icon>
+          </v-btn>
         </template>
-        <template #append>
-          <MissingFromFSIcon
-            v-if="item.raw.missing_from_fs"
-            text="Missing platform from filesystem"
-            chip
-            chip-label
-            chip-density="compact"
-            class="ml-2"
-          />
-          <v-chip class="ml-2" size="x-small" label>
-            {{ item.raw.rom_count }}
-          </v-chip>
+      </v-tooltip>
+      <v-tooltip
+        text="Match ALL of the selected platforms (AND logic) - Note: Will return no results since a ROM belongs to only one platform"
+        location="bottom"
+        open-delay="500"
+      >
+        <template #activator="{ props }">
+          <v-btn value="all" size="small" v-bind="props">
+            <v-icon size="x-large">mdi-set-all</v-icon>
+          </v-btn>
         </template>
-      </v-list-item>
-    </template>
-    <template #chip="{ item }">
-      <v-chip>
-        <PlatformIcon
-          :key="item.raw.slug"
-          :slug="item.raw.slug"
-          :name="item.raw.name"
-          :fs-slug="item.raw.fs_slug"
-          :size="20"
-          class="mr-2"
-        />
-        {{ item.raw.name }}
-      </v-chip>
-    </template>
-  </v-select>
+      </v-tooltip>
+    </v-btn-toggle>
+  </div>
 </template>
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 5ba10cf07..d67d719b0 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -62,6 +62,7 @@ async function uploadRoms({
 
 export interface GetRomsParams {
   platformId?: number | null;
+  platformIds?: number[] | null;
   collectionId?: number | null;
   virtualCollectionId?: string | null;
   smartCollectionId?: number | null;
@@ -98,6 +99,7 @@ export interface GetRomsParams {
   selectedLanguages?: string[] | null;
   selectedStatuses?: string[] | null;
   // Logic operators for multi-value filters
+  platformsLogic?: string | null;
   genresLogic?: string | null;
   franchisesLogic?: string | null;
   collectionsLogic?: string | null;
@@ -109,6 +111,7 @@ export interface GetRomsParams {
 
 async function getRoms({
   platformId = null,
+  platformIds = null,
   collectionId = null,
   virtualCollectionId = null,
   smartCollectionId = null,
@@ -143,6 +146,7 @@ async function getRoms({
   selectedLanguages = null,
   selectedStatuses = null,
   // Logic operators
+  platformsLogic = null,
   genresLogic = null,
   franchisesLogic = null,
   collectionsLogic = null,
@@ -163,6 +167,8 @@ async function getRoms({
 
   const params = {
     platform_id: platformId,
+    platform_ids:
+      platformIds && platformIds.length > 0 ? platformIds : undefined,
     collection_id: collectionId,
     virtual_collection_id: virtualCollectionId,
     smart_collection_id: smartCollectionId,
@@ -181,6 +187,10 @@ async function getRoms({
     region: getFilterArray(selectedRegion, selectedRegions),
     language: getFilterArray(selectedLanguage, selectedLanguages),
     // Logic operators
+    platforms_logic:
+      platformIds && platformIds.length > 1
+        ? platformsLogic || "any"
+        : undefined,
     genres_logic:
       selectedGenres && selectedGenres.length > 1
         ? genresLogic || "any"
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index aaa2462e7..87e1889d7 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -47,6 +47,10 @@ class CachedApiService {
   ): Promise<AxiosResponse<GetRomsResponse>> {
     const config = this.createRequestConfig("GET", "/roms", {
       platform_id: params.platformId,
+      platform_ids:
+        params.platformIds && params.platformIds.length > 0
+          ? params.platformIds
+          : undefined,
       collection_id: params.collectionId,
       virtual_collection_id: params.virtualCollectionId,
       smart_collection_id: params.smartCollectionId,
@@ -83,6 +87,10 @@ class CachedApiService {
         params.selectedLanguages,
       ),
       // Logic operators
+      platforms_logic:
+        params.platformIds && params.platformIds.length > 1
+          ? params.platformsLogic || "any"
+          : undefined,
       genres_logic:
         params.selectedGenres && params.selectedGenres.length > 1
           ? params.genresLogic || "any"
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index a10d51288..496393156 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -99,9 +99,15 @@ export default defineStore("roms", {
       const params = {
         searchTerm: galleryFilter.searchTerm,
         platformId:
-          this.currentPlatform?.id ??
-          galleryFilter.selectedPlatform?.id ??
-          null,
+          galleryFilter.selectedPlatforms.length > 0
+            ? null
+            : (this.currentPlatform?.id ??
+              galleryFilter.selectedPlatform?.id ??
+              null),
+        platformIds:
+          galleryFilter.selectedPlatforms.length > 0
+            ? galleryFilter.selectedPlatforms.map((p) => p.id)
+            : null,
         collectionId: this.currentCollection?.id ?? null,
         virtualCollectionId: this.currentVirtualCollection?.id ?? null,
         smartCollectionId: this.currentSmartCollection?.id ?? null,
@@ -185,6 +191,7 @@ export default defineStore("roms", {
             ? galleryFilter.selectedStatuses
             : null,
         // Logic operators
+        platformsLogic: galleryFilter.platformsLogic,
         genresLogic: galleryFilter.genresLogic,
         franchisesLogic: galleryFilter.franchisesLogic,
         collectionsLogic: galleryFilter.collectionsLogic,

From b4dd08d7b4361dbb52dbdeaaa41c05f1aeeb16f7 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 20:13:29 +0000
Subject: [PATCH 11/73] Refactor platform filtering logic: remove single
 platform ID and logic operator parameters, streamline multi-platform handling
 in API and frontend components.

---
 backend/endpoints/rom.py                      | 13 ------
 backend/handler/database/roms_handler.py      | 10 +----
 .../common/FilterDrawer/FilterPlatformBtn.vue | 40 +------------------
 frontend/src/services/api/rom.ts              |  9 -----
 frontend/src/services/cache/api.ts            |  4 --
 frontend/src/stores/galleryFilter.ts          |  5 ---
 frontend/src/stores/roms.ts                   | 26 +++++++-----
 7 files changed, 18 insertions(+), 89 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index b70d76c0c..00fd5e5dd 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -201,10 +201,6 @@ def get_roms(
         str | None,
         Query(description="Search term to filter roms."),
     ] = None,
-    platform_id: Annotated[
-        int | None,
-        Query(description="Platform internal id.", ge=1),
-    ] = None,
     platform_ids: Annotated[
         list[int] | None,
         Query(
@@ -361,13 +357,6 @@ def get_roms(
         Query(description="Order direction, either 'asc' or 'desc'."),
     ] = "asc",
     # Logic operators for multi-value filters
-    platforms_logic: Annotated[
-        str,
-        Query(
-            description="Logic operator for platforms filter: 'any' (OR) or 'all' (AND).",
-            alias="platforms_logic",
-        ),
-    ] = "any",
     genres_logic: Annotated[
         str,
         Query(
@@ -480,7 +469,6 @@ def get_roms(
     query = db_rom_handler.filter_roms(
         query=query,
         user_id=request.user.id,
-        platform_id=platform_id,
         platform_ids=platform_ids,
         collection_id=collection_id,
         virtual_collection_id=virtual_collection_id,
@@ -502,7 +490,6 @@ def get_roms(
         regions=regions,
         languages=languages,
         # Logic operators
-        platforms_logic=platforms_logic,
         genres_logic=genres_logic,
         franchises_logic=franchises_logic,
         collections_logic=collections_logic,
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index b8f6883f0..cc6bc95fc 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -431,7 +431,6 @@ class DBRomsHandler(DBBaseHandler):
     def filter_roms(
         self,
         query: Query,
-        platform_id: int | None = None,
         platform_ids: Sequence[int] | None = None,
         collection_id: int | None = None,
         virtual_collection_id: str | None = None,
@@ -454,7 +453,6 @@ class DBRomsHandler(DBBaseHandler):
         regions: Sequence[str] | None = None,
         languages: Sequence[str] | None = None,
         # Logic operators for multi-value filters
-        platforms_logic: str = "any",
         genres_logic: str = "any",
         franchises_logic: str = "any",
         collections_logic: str = "any",
@@ -467,13 +465,9 @@ class DBRomsHandler(DBBaseHandler):
     ) -> Query[Rom]:
         from handler.scan_handler import MetadataSource
 
-        # Handle platform filtering with priority for multi-platform
+        # Handle platform filtering - platform filtering always uses OR logic since ROMs belong to only one platform
         if platform_ids:
-            query = self.filter_by_platform_ids(
-                query, platform_ids, match_all=(platforms_logic == "all")
-            )
-        elif platform_id:
-            query = self.filter_by_platform_id(query, platform_id)
+            query = self.filter_by_platform_ids(query, platform_ids, match_all=False)
 
         if collection_id:
             query = self.filter_by_collection_id(query, session, collection_id)
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
index 245c84a16..d0f0eda9b 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
@@ -14,8 +14,7 @@ defineProps<{
 
 const { t } = useI18n();
 const galleryFilterStore = storeGalleryFilter();
-const { selectedPlatforms, filterPlatforms, platformsLogic } =
-  storeToRefs(galleryFilterStore);
+const { selectedPlatforms, filterPlatforms } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
 </script>
 
@@ -84,42 +83,5 @@ const emitter = inject<Emitter<Events>>("emitter");
         </v-chip>
       </template>
     </v-select>
-    <!-- AND/OR Logic Toggle - always visible -->
-    <v-btn-toggle
-      :model-value="platformsLogic"
-      mandatory
-      variant="outlined"
-      density="compact"
-      class="flex-shrink-0"
-      @update:model-value="
-        (value) => {
-          galleryFilterStore.setPlatformsLogic(value);
-          nextTick(() => emitter?.emit('filterRoms', null));
-        }
-      "
-    >
-      <v-tooltip
-        text="Match ANY of the selected platforms (OR logic)"
-        location="bottom"
-        open-delay="500"
-      >
-        <template #activator="{ props }">
-          <v-btn value="any" size="small" v-bind="props">
-            <v-icon size="x-large">mdi-set-none</v-icon>
-          </v-btn>
-        </template>
-      </v-tooltip>
-      <v-tooltip
-        text="Match ALL of the selected platforms (AND logic) - Note: Will return no results since a ROM belongs to only one platform"
-        location="bottom"
-        open-delay="500"
-      >
-        <template #activator="{ props }">
-          <v-btn value="all" size="small" v-bind="props">
-            <v-icon size="x-large">mdi-set-all</v-icon>
-          </v-btn>
-        </template>
-      </v-tooltip>
-    </v-btn-toggle>
   </div>
 </template>
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index d67d719b0..f696ef2a0 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -61,7 +61,6 @@ async function uploadRoms({
 }
 
 export interface GetRomsParams {
-  platformId?: number | null;
   platformIds?: number[] | null;
   collectionId?: number | null;
   virtualCollectionId?: string | null;
@@ -99,7 +98,6 @@ export interface GetRomsParams {
   selectedLanguages?: string[] | null;
   selectedStatuses?: string[] | null;
   // Logic operators for multi-value filters
-  platformsLogic?: string | null;
   genresLogic?: string | null;
   franchisesLogic?: string | null;
   collectionsLogic?: string | null;
@@ -110,7 +108,6 @@ export interface GetRomsParams {
 }
 
 async function getRoms({
-  platformId = null,
   platformIds = null,
   collectionId = null,
   virtualCollectionId = null,
@@ -146,7 +143,6 @@ async function getRoms({
   selectedLanguages = null,
   selectedStatuses = null,
   // Logic operators
-  platformsLogic = null,
   genresLogic = null,
   franchisesLogic = null,
   collectionsLogic = null,
@@ -166,7 +162,6 @@ async function getRoms({
   };
 
   const params = {
-    platform_id: platformId,
     platform_ids:
       platformIds && platformIds.length > 0 ? platformIds : undefined,
     collection_id: collectionId,
@@ -187,10 +182,6 @@ async function getRoms({
     region: getFilterArray(selectedRegion, selectedRegions),
     language: getFilterArray(selectedLanguage, selectedLanguages),
     // Logic operators
-    platforms_logic:
-      platformIds && platformIds.length > 1
-        ? platformsLogic || "any"
-        : undefined,
     genres_logic:
       selectedGenres && selectedGenres.length > 1
         ? genresLogic || "any"
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index 87e1889d7..23fdd45c4 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -87,10 +87,6 @@ class CachedApiService {
         params.selectedLanguages,
       ),
       // Logic operators
-      platforms_logic:
-        params.platformIds && params.platformIds.length > 1
-          ? params.platformsLogic || "any"
-          : undefined,
       genres_logic:
         params.selectedGenres && params.selectedGenres.length > 1
           ? params.genresLogic || "any"
diff --git a/frontend/src/stores/galleryFilter.ts b/frontend/src/stores/galleryFilter.ts
index c9dc94b4d..4d3c6c017 100644
--- a/frontend/src/stores/galleryFilter.ts
+++ b/frontend/src/stores/galleryFilter.ts
@@ -53,7 +53,6 @@ const defaultFilterState = {
   selectedStatus: null as string | null,
   selectedStatuses: [] as string[],
   // Logic operators for multi-select filters
-  platformsLogic: "any" as "any" | "all",
   genresLogic: "any" as "any" | "all",
   franchisesLogic: "any" as "any" | "all",
   collectionsLogic: "any" as "any" | "all",
@@ -103,9 +102,6 @@ export default defineStore("galleryFilter", {
     setSelectedFilterPlatforms(platforms: Platform[]) {
       this.selectedPlatforms = platforms;
     },
-    setPlatformsLogic(logic: "any" | "all") {
-      this.platformsLogic = logic;
-    },
     setSelectedFilterGenre(genre: string) {
       this.selectedGenre = genre;
     },
@@ -405,7 +401,6 @@ export default defineStore("galleryFilter", {
       this.filterMissing = null;
       this.filterVerified = null;
       // Reset logic operators to default
-      this.platformsLogic = "any";
       this.genresLogic = "any";
       this.franchisesLogic = "any";
       this.collectionsLogic = "any";
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 496393156..5f3f0790b 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -96,18 +96,23 @@ export default defineStore("roms", {
     },
     // Fetching multiple roms
     _buildRequestParams(galleryFilter: GalleryFilterStore) {
+      // Determine platform IDs - use multiselect platforms if available, otherwise convert single platform to array
+      let platformIds: number[] | null = null;
+      if (galleryFilter.selectedPlatforms.length > 0) {
+        platformIds = galleryFilter.selectedPlatforms.map((p) => p.id);
+      } else {
+        const singlePlatformId =
+          this.currentPlatform?.id ??
+          galleryFilter.selectedPlatform?.id ??
+          null;
+        if (singlePlatformId) {
+          platformIds = [singlePlatformId];
+        }
+      }
+
       const params = {
         searchTerm: galleryFilter.searchTerm,
-        platformId:
-          galleryFilter.selectedPlatforms.length > 0
-            ? null
-            : (this.currentPlatform?.id ??
-              galleryFilter.selectedPlatform?.id ??
-              null),
-        platformIds:
-          galleryFilter.selectedPlatforms.length > 0
-            ? galleryFilter.selectedPlatforms.map((p) => p.id)
-            : null,
+        platformIds: platformIds,
         collectionId: this.currentCollection?.id ?? null,
         virtualCollectionId: this.currentVirtualCollection?.id ?? null,
         smartCollectionId: this.currentSmartCollection?.id ?? null,
@@ -191,7 +196,6 @@ export default defineStore("roms", {
             ? galleryFilter.selectedStatuses
             : null,
         // Logic operators
-        platformsLogic: galleryFilter.platformsLogic,
         genresLogic: galleryFilter.genresLogic,
         franchisesLogic: galleryFilter.franchisesLogic,
         collectionsLogic: galleryFilter.collectionsLogic,

From 2f79bd2d8cea04f41fdc994bbf22f391fd3d606d Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 20:16:02 +0000
Subject: [PATCH 12/73] Fix chip template binding in FilterPlatformBtn
 component for proper prop handling

---
 .../Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
index d0f0eda9b..32f8a220c 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
@@ -69,8 +69,8 @@ const emitter = inject<Emitter<Events>>("emitter");
           </template>
         </v-list-item>
       </template>
-      <template #chip="{ item }">
-        <v-chip>
+      <template #chip="{ item, props }">
+        <v-chip v-bind="props">
           <PlatformIcon
             :key="item.raw.slug"
             :slug="item.raw.slug"

From 39a43e44d5761ed4f998414f15bd7d3ad60189ff Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 21:33:16 +0000
Subject: [PATCH 13/73] Implement multi-platform selection in filter drawer and
 update state management to clear single platform selection

---
 .../AppBar/common/FilterDrawer/Base.vue       | 134 ++++++++++++++----
 frontend/src/stores/galleryFilter.ts          |   2 +
 2 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 21aaa2d6e..41e5629e9 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -76,6 +76,7 @@ const {
   selectedStatuses,
   statusesLogic,
   selectedPlatform,
+  selectedPlatforms,
   selectedRegion,
   filterRegions,
   selectedRegions,
@@ -98,17 +99,48 @@ const onFilterChange = debounce(
     // Update URL with filters
     Object.entries({
       search: searchTerm.value,
-      filterMatched: filterMatched.value ? "1" : null,
-      filterUnmatched: filterUnmatched.value ? "1" : null,
-      filterFavorites: filterFavorites.value ? "1" : null,
-      filterDuplicates: filterDuplicates.value ? "1" : null,
-      filterPlayables: filterPlayables.value ? "1" : null,
-      filterMissing: filterMissing.value ? "1" : null,
-      filterVerified: filterVerified.value ? "1" : null,
-      filterRA: filterRA.value ? "1" : null,
-      platform: selectedPlatform.value
-        ? String(selectedPlatform.value.id)
-        : null,
+      matched:
+        filterMatched.value === true
+          ? "1"
+          : filterUnmatched.value === true
+            ? "2"
+            : null,
+      filterFavorites:
+        filterFavorites.value === true
+          ? "1"
+          : filterFavorites.value === false
+            ? "0"
+            : null,
+      filterDuplicates:
+        filterDuplicates.value === true
+          ? "1"
+          : filterDuplicates.value === false
+            ? "0"
+            : null,
+      filterPlayables:
+        filterPlayables.value === true
+          ? "1"
+          : filterPlayables.value === false
+            ? "0"
+            : null,
+      filterMissing:
+        filterMissing.value === true
+          ? "1"
+          : filterMissing.value === false
+            ? "0"
+            : null,
+      filterVerified:
+        filterVerified.value === true
+          ? "1"
+          : filterVerified.value === false
+            ? "0"
+            : null,
+      filterRA:
+        filterRA.value === true ? "1" : filterRA.value === false ? "0" : null,
+      platforms:
+        selectedPlatforms.value.length > 0
+          ? selectedPlatforms.value.map((p) => String(p.id)).join(",")
+          : null,
       genre: selectedGenre.value,
       genres:
         selectedGenres.value.length > 0 ? selectedGenres.value.join(",") : null,
@@ -365,8 +397,7 @@ function setFilters() {
 onMounted(async () => {
   const {
     search: urlSearch,
-    filterMatched: urlFilteredMatch,
-    filterUnmatched: urlFilteredUnmatched,
+    matched: urlMatched,
     filterFavorites: urlFilteredFavorites,
     filterDuplicates: urlFilteredDuplicates,
     filterPlayables: urlFilteredPlayables,
@@ -374,6 +405,7 @@ onMounted(async () => {
     filterVerified: urlFilteredVerified,
     filterRA: urlFilteredRa,
     platform: urlPlatform,
+    platforms: urlPlatforms,
     // Single value URL params (backward compatibility)
     genre: urlGenre,
     franchise: urlFranchise,
@@ -403,35 +435,81 @@ onMounted(async () => {
   } = router.currentRoute.value.query;
 
   // Check for query params to set filters
-  if (urlFilteredMatch !== undefined) {
-    galleryFilterStore.setFilterMatched(true);
-  }
-  if (urlFilteredUnmatched !== undefined) {
-    galleryFilterStore.setFilterUnmatched(true);
+  if (urlMatched !== undefined) {
+    if (urlMatched === "1") {
+      galleryFilterStore.setFilterMatched(true);
+    } else if (urlMatched === "2") {
+      galleryFilterStore.setFilterUnmatched(true);
+    }
+    // urlMatched === "0" or any other value means no filter (both remain null)
   }
   if (urlFilteredFavorites !== undefined) {
-    galleryFilterStore.setFilterFavorites(true);
+    galleryFilterStore.setFilterFavorites(
+      urlFilteredFavorites === "1"
+        ? true
+        : urlFilteredFavorites === "0"
+          ? false
+          : null,
+    );
   }
   if (urlFilteredDuplicates !== undefined) {
-    galleryFilterStore.setFilterDuplicates(true);
+    galleryFilterStore.setFilterDuplicates(
+      urlFilteredDuplicates === "1"
+        ? true
+        : urlFilteredDuplicates === "0"
+          ? false
+          : null,
+    );
   }
   if (urlFilteredPlayables !== undefined) {
-    galleryFilterStore.setFilterPlayables(true);
+    galleryFilterStore.setFilterPlayables(
+      urlFilteredPlayables === "1"
+        ? true
+        : urlFilteredPlayables === "0"
+          ? false
+          : null,
+    );
   }
   if (urlFilteredMissing !== undefined) {
-    galleryFilterStore.setFilterMissing(true);
+    galleryFilterStore.setFilterMissing(
+      urlFilteredMissing === "1"
+        ? true
+        : urlFilteredMissing === "0"
+          ? false
+          : null,
+    );
   }
   if (urlFilteredVerified !== undefined) {
-    galleryFilterStore.setFilterVerified(true);
+    galleryFilterStore.setFilterVerified(
+      urlFilteredVerified === "1"
+        ? true
+        : urlFilteredVerified === "0"
+          ? false
+          : null,
+    );
   }
   if (urlFilteredRa !== undefined) {
-    galleryFilterStore.setFilterRA(true);
-  }
-  if (urlPlatform !== undefined) {
-    const platform = platformsStore.get(Number(urlPlatform));
-    if (platform) galleryFilterStore.setSelectedFilterPlatform(platform);
+    galleryFilterStore.setFilterRA(
+      urlFilteredRa === "1" ? true : urlFilteredRa === "0" ? false : null,
+    );
   }
   // Check for query params to set multi-value filters (prioritize over single values)
+  if (urlPlatforms !== undefined) {
+    const platformIds = (urlPlatforms as string)
+      .split(",")
+      .filter((p) => p.trim())
+      .map(Number);
+    const platforms = platformIds
+      .map((id) => platformsStore.get(id))
+      .filter(Boolean);
+    if (platforms.length > 0) {
+      galleryFilterStore.setSelectedFilterPlatforms(platforms);
+    }
+  } else if (urlPlatform !== undefined) {
+    // Backward compatibility: if single platform is set, convert to multiselect
+    const platform = platformsStore.get(Number(urlPlatform));
+    if (platform) galleryFilterStore.setSelectedFilterPlatforms([platform]);
+  }
   if (urlGenres !== undefined) {
     const genres = (urlGenres as string).split(",").filter((g) => g.trim());
     galleryFilterStore.setSelectedFilterGenres(genres);
diff --git a/frontend/src/stores/galleryFilter.ts b/frontend/src/stores/galleryFilter.ts
index 4d3c6c017..bff511a64 100644
--- a/frontend/src/stores/galleryFilter.ts
+++ b/frontend/src/stores/galleryFilter.ts
@@ -101,6 +101,8 @@ export default defineStore("galleryFilter", {
     },
     setSelectedFilterPlatforms(platforms: Platform[]) {
       this.selectedPlatforms = platforms;
+      // Clear single platform selection to avoid conflicts
+      this.selectedPlatform = null;
     },
     setSelectedFilterGenre(genre: string) {
       this.selectedGenre = genre;

From c4fc2e01f80660da6f5983215067210d10440b76 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 22:39:11 +0000
Subject: [PATCH 14/73] Refactor platform filtering logic: update platform ID
 handling to support multi-value filtering in API and frontend components

---
 .../src/components/Gallery/AppBar/common/FilterDrawer/Base.vue  | 2 +-
 frontend/src/services/cache/api.ts                              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 41e5629e9..0846bb1a1 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -501,7 +501,7 @@ onMounted(async () => {
       .map(Number);
     const platforms = platformIds
       .map((id) => platformsStore.get(id))
-      .filter(Boolean);
+      .filter((p): p is NonNullable<typeof p> => p !== undefined);
     if (platforms.length > 0) {
       galleryFilterStore.setSelectedFilterPlatforms(platforms);
     }
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index 23fdd45c4..686dc4504 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -46,7 +46,6 @@ class CachedApiService {
     onBackgroundUpdate: (data: GetRomsResponse) => void,
   ): Promise<AxiosResponse<GetRomsResponse>> {
     const config = this.createRequestConfig("GET", "/roms", {
-      platform_id: params.platformId,
       platform_ids:
         params.platformIds && params.platformIds.length > 0
           ? params.platformIds

From c1d43f67f8a365fdf4801c4325be5dc1392003b5 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 22:52:33 +0000
Subject: [PATCH 15/73] Refactor ROM retrieval to support multi-value platform
 filtering across various handlers and endpoints

---
 backend/endpoints/feeds.py                               | 8 ++++----
 backend/handler/database/collections_handler.py          | 5 ++++-
 backend/handler/database/roms_handler.py                 | 2 +-
 backend/tasks/manual/cleanup_orphaned_resources.py       | 2 +-
 .../handler/cassettes/test_fastapi/test_scan_rom.yaml    | 9 ++-------
 backend/tests/handler/test_db_handler.py                 | 6 +++---
 backend/utils/gamelist_exporter.py                       | 2 +-
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/backend/endpoints/feeds.py b/backend/endpoints/feeds.py
index f9ef2f6bc..87b86ab48 100644
--- a/backend/endpoints/feeds.py
+++ b/backend/endpoints/feeds.py
@@ -95,7 +95,7 @@ def platforms_webrcade_feed(request: Request) -> WebrcadeFeedSchema:
             continue
 
         category_items = []
-        roms = db_rom_handler.get_roms_scalar(platform_id=p.id)
+        roms = db_rom_handler.get_roms_scalar(platform_ids=[p.id])
         for rom in roms:
             download_url = generate_rom_download_url(request, rom)
             category_item = WebrcadeFeedItemSchema(
@@ -206,7 +206,7 @@ async def tinfoil_index_feed(
 
         return titledb
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=switch.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[switch.id])
 
     return TinfoilFeedSchema(
         files=[
@@ -294,7 +294,7 @@ def pkgi_ps3_feed(
             status_code=400, detail=f"Invalid content type: {content_type}"
         ) from e
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=ps3_platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[ps3_platform.id])
     txt_lines = []
 
     for rom in roms:
@@ -365,7 +365,7 @@ def pkgi_psvita_feed(
             status_code=400, detail=f"Invalid content type: {content_type}"
         ) from e
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=psvita_platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[psvita_platform.id])
     txt_lines = []
 
     for rom in roms:
diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
index 974e87279..7202c6a7d 100644
--- a/backend/handler/database/collections_handler.py
+++ b/backend/handler/database/collections_handler.py
@@ -232,8 +232,11 @@ class DBCollectionsHandler(DBBaseHandler):
         languages = convert_legacy_filter("languages", "selected_language")
 
         # Use the existing filter_roms method with the stored criteria
+        platform_id = criteria.get("platform_id")
+        platform_ids = [platform_id] if platform_id is not None else None
+
         return db_rom_handler.get_roms_scalar(
-            platform_id=criteria.get("platform_id"),
+            platform_ids=platform_ids,
             collection_id=criteria.get("collection_id"),
             virtual_collection_id=criteria.get("virtual_collection_id"),
             search_term=criteria.get("search_term"),
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index cc6bc95fc..ca1448c21 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -739,7 +739,7 @@ class DBRomsHandler(DBBaseHandler):
         )
         roms = self.filter_roms(
             query=query,
-            platform_id=kwargs.get("platform_id", None),
+            platform_ids=kwargs.get("platform_ids", None),
             collection_id=kwargs.get("collection_id", None),
             virtual_collection_id=kwargs.get("virtual_collection_id", None),
             search_term=kwargs.get("search_term", None),
diff --git a/backend/tasks/manual/cleanup_orphaned_resources.py b/backend/tasks/manual/cleanup_orphaned_resources.py
index 337715503..b065c852b 100644
--- a/backend/tasks/manual/cleanup_orphaned_resources.py
+++ b/backend/tasks/manual/cleanup_orphaned_resources.py
@@ -68,7 +68,7 @@ class CleanupOrphanedResourcesTask(Task):
         existing_roms_by_platform: dict[int, set[int]] = {
             platform_id: {
                 rom.id
-                for rom in db_rom_handler.get_roms_scalar(platform_id=platform_id)
+                for rom in db_rom_handler.get_roms_scalar(platform_ids=[platform_id])
             }
             for platform_id in existing_platforms
         }
diff --git a/backend/tests/handler/cassettes/test_fastapi/test_scan_rom.yaml b/backend/tests/handler/cassettes/test_fastapi/test_scan_rom.yaml
index 4c95f9514..c9cb66c94 100644
--- a/backend/tests/handler/cassettes/test_fastapi/test_scan_rom.yaml
+++ b/backend/tests/handler/cassettes/test_fastapi/test_scan_rom.yaml
@@ -16,8 +16,7 @@ interactions:
       uri: https://playmatch.retrorealm.dev/api/identify/ids?fileName=Paper+Mario+(USA).z64&fileSize=1024
     response:
       body:
-        string: !!binary |
-          CxKAeyJnYW1lTWF0Y2hUeXBlIjoiTm9NYXRjaCIsImlkIjpudWxsfQM=
+        string: '{"gameMatchType":"NoMatch","id":null}'
       headers:
         Age:
           - "81"
@@ -29,8 +28,6 @@ interactions:
           - HIT
         Connection:
           - keep-alive
-        Content-Encoding:
-          - br
         Content-Type:
           - application/json
         Date:
@@ -43,8 +40,6 @@ interactions:
           - '{"group":"cf-nel","max_age":604800,"endpoints":[{"url":"https://a.nel.cloudflare.com/report/v4?s=mjZ4A7YtYFmLhvxBpW6QPl821crHqZZvQpN%2B8KgRa1zLBnsoeewii%2FWWpbQC7wKBCHw7a818u5WLZOYV60b7as%2Far6YDNSodkqsgt%2BNs4w9z%2F2bhZL22Sw%3D%3D"}]}'
         Server:
           - cloudflare
-        Transfer-Encoding:
-          - chunked
         Vary:
           - accept-encoding
         X-Ratelimit-Limit:
@@ -101,7 +96,7 @@ interactions:
         message: OK
   - request:
       body:
-        search "paper mario"; fields id,name,slug,summary,total_rating,aggregated_rating,first_release_date,artworks.url,cover.url,screenshots.url,platforms.id,platforms.name,alternative_names.name,genres.name,franchise.name,franchises.name,collections.name,game_modes.name,involved_companies.company.name,expansions.id,expansions.slug,expansions.name,expansions.cover.url,expanded_games.id,expanded_games.slug,expanded_games.name,expanded_games.cover.url,dlcs.id,dlcs.name,dlcs.slug,dlcs.cover.url,remakes.id,remakes.slug,remakes.name,remakes.cover.url,remasters.id,remasters.slug,remasters.name,remasters.cover.url,ports.id,ports.slug,ports.name,ports.cover.url,similar_games.id,similar_games.slug,similar_games.name,similar_games.cover.url,age_ratings.rating_category,videos.video_id;
+        search "paper mario"; fields id,name,slug,summary,total_rating,aggregated_rating,first_release_date,artworks.url,cover.url,screenshots.url,platforms.id,platforms.name,alternative_names.name,genres.name,franchise.name,franchises.name,collections.name,game_modes.name,involved_companies.company.name,expansions.id,expansions.slug,expansions.name,expansions.cover.url,expanded_games.id,expanded_games.slug,expanded_games.name,expanded_games.cover.url,dlcs.id,dlcs.name,dlcs.slug,dlcs.cover.url,remakes.id,remakes.slug,remakes.name,remakes.cover.url,remasters.id,remasters.slug,remasters.name,remasters.cover.url,ports.id,ports.slug,ports.name,ports.cover.url,similar_games.id,similar_games.slug,similar_games.name,similar_games.cover.url,age_ratings.rating_category,videos.video_id,game_localizations.id,game_localizations.name,game_localizations.cover.url,game_localizations.region.identifier,game_localizations.region.category;
         where platforms=[4] & game_type=(10,0,11,8,9); limit 200;
       headers:
         accept:
diff --git a/backend/tests/handler/test_db_handler.py b/backend/tests/handler/test_db_handler.py
index 2715ada79..e71002b01 100644
--- a/backend/tests/handler/test_db_handler.py
+++ b/backend/tests/handler/test_db_handler.py
@@ -47,7 +47,7 @@ def test_roms(rom: Rom, platform: Platform):
         )
     )
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[platform.id])
     assert len(roms) == 2
 
     rom_1 = db_rom_handler.get_rom(roms[0].id)
@@ -61,12 +61,12 @@ def test_roms(rom: Rom, platform: Platform):
 
     db_rom_handler.delete_rom(rom.id)
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[platform.id])
     assert len(roms) == 1
 
     db_rom_handler.mark_missing_roms(rom_2.platform_id, [])
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[platform.id])
     assert len(roms) == 1
 
 
diff --git a/backend/utils/gamelist_exporter.py b/backend/utils/gamelist_exporter.py
index 020d8c6c4..f68ce7da1 100644
--- a/backend/utils/gamelist_exporter.py
+++ b/backend/utils/gamelist_exporter.py
@@ -168,7 +168,7 @@ class GamelistExporter:
         if not platform:
             raise ValueError(f"Platform with ID {platform_id} not found")
 
-        roms = db_rom_handler.get_roms_scalar(platform_id=platform_id)
+        roms = db_rom_handler.get_roms_scalar(platform_ids=[platform_id])
 
         # Create root element
         root = Element("gameList")

From a079613be25070612f1761352cb0ab81c8fb81bb Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 22:56:14 +0000
Subject: [PATCH 16/73] Refactor platform filtering logic: simplify
 filter_by_platform_ids method by removing match_all parameter and redundant
 AND logic

---
 backend/handler/database/roms_handler.py | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index ca1448c21..a2a14f0a5 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -187,20 +187,9 @@ class DBRomsHandler(DBBaseHandler):
         return query.filter(Rom.platform_id == platform_id)
 
     def filter_by_platform_ids(
-        self,
-        query: Query,
-        platform_ids: Sequence[int],
-        match_all: bool = False,
+        self, query: Query, platform_ids: Sequence[int]
     ) -> Query:
-        if match_all:
-            # AND logic: This doesn't make sense for platforms since a ROM belongs to exactly one platform
-            # But we'll implement it for completeness - will return no results
-            for pid in platform_ids:
-                query = query.filter(Rom.platform_id == pid)
-            return query
-        else:
-            # OR logic: ROM belongs to any of the specified platforms
-            return query.filter(Rom.platform_id.in_(platform_ids))
+        return query.filter(Rom.platform_id.in_(platform_ids))
 
     def filter_by_collection_id(
         self, query: Query, session: Session, collection_id: int
@@ -467,7 +456,7 @@ class DBRomsHandler(DBBaseHandler):
 
         # Handle platform filtering - platform filtering always uses OR logic since ROMs belong to only one platform
         if platform_ids:
-            query = self.filter_by_platform_ids(query, platform_ids, match_all=False)
+            query = self.filter_by_platform_ids(query, platform_ids)
 
         if collection_id:
             query = self.filter_by_collection_id(query, session, collection_id)

From ade5c7c248b180599fb20d96bafb350a26da3d95 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 23:02:59 +0000
Subject: [PATCH 17/73] Remove redundant sanitization logic for filter arrays
 in get_roms function

---
 backend/endpoints/rom.py | 52 ----------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 00fd5e5dd..d9ee96a77 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -209,7 +209,6 @@ def get_roms(
                 " parameter, and results that match any of the values will be"
                 " returned. Maximum 20 values allowed."
             ),
-            max_length=20,
         ),
     ] = None,
     collection_id: Annotated[
@@ -408,57 +407,6 @@ def get_roms(
     ] = "any",
 ) -> CustomLimitOffsetPage[SimpleRomSchema]:
     """Retrieve roms."""
-
-    # Sanitize and validate filter arrays
-    def sanitize_filter_array(
-        values: list[str] | None, max_length: int = 50, filter_name: str = ""
-    ) -> list[str] | None:
-        """Sanitize filter array by removing empty strings and limiting size."""
-        if not values:
-            return None
-
-        try:
-            # Remove empty/whitespace-only values and strip whitespace
-            sanitized = [
-                v.strip() for v in values if v and isinstance(v, str) and v.strip()
-            ]
-            if not sanitized:
-                return None
-
-            # Limit array size to prevent abuse
-            if len(sanitized) > max_length:
-                logging.warning(
-                    f"Filter array '{filter_name}' truncated from {len(sanitized)} to {max_length} items"
-                )
-                sanitized = sanitized[:max_length]
-
-            return sanitized
-        except Exception as e:
-            logging.error(f"Error sanitizing filter array '{filter_name}': {e}")
-            return None
-
-    # Apply sanitization with specific limits and names
-    platform_ids = sanitize_filter_array(
-        [str(pid) for pid in platform_ids] if platform_ids else None, 20, "platform_ids"
-    )
-    # Convert back to integers and validate >= 1
-    if platform_ids:
-        try:
-            platform_ids = [int(pid) for pid in platform_ids if int(pid) >= 1]
-            if not platform_ids:
-                platform_ids = None
-        except (ValueError, TypeError):
-            platform_ids = None
-
-    genres = sanitize_filter_array(genres, 50, "genres")
-    franchises = sanitize_filter_array(franchises, 50, "franchises")
-    collections = sanitize_filter_array(collections, 50, "collections")
-    companies = sanitize_filter_array(companies, 50, "companies")
-    age_ratings = sanitize_filter_array(age_ratings, 20, "age_ratings")
-    regions = sanitize_filter_array(regions, 30, "regions")
-    languages = sanitize_filter_array(languages, 30, "languages")
-
-    # Get the base roms query
     query, order_by_attr = db_rom_handler.get_roms_query(
         user_id=request.user.id,
         order_by=order_by.lower(),

From 5ecc815f6f2de0a8872750403153c6732e41f60c Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 27 Nov 2025 23:09:34 +0000
Subject: [PATCH 18/73] Refactor: centralize filter array logic into a new
 utility function for improved code reuse

---
 frontend/src/services/api/rom.ts   | 11 +--------
 frontend/src/services/cache/api.ts | 37 +++++++-----------------------
 frontend/src/utils/apiHelpers.ts   | 18 +++++++++++++++
 3 files changed, 27 insertions(+), 39 deletions(-)
 create mode 100644 frontend/src/utils/apiHelpers.ts

diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index f696ef2a0..e9be28bd5 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -11,6 +11,7 @@ import storeHeartbeat from "@/stores/heartbeat";
 import type { DetailedRom, SimpleRom, SearchRom } from "@/stores/roms";
 import storeUpload from "@/stores/upload";
 import { getDownloadPath, getStatusKeyForText } from "@/utils";
+import { getFilterArray } from "@/utils/apiHelpers";
 
 export const romApi = api;
 
@@ -151,16 +152,6 @@ async function getRoms({
   regionsLogic = null,
   languagesLogic = null,
 }: GetRomsParams): Promise<{ data: GetRomsResponse }> {
-  // Helper function to handle single vs multi-value parameters
-  const getFilterArray = (
-    single: string | null,
-    multi: string[] | null,
-  ): string[] | undefined => {
-    if (multi && multi.length > 0) return multi;
-    if (single) return [single];
-    return undefined;
-  };
-
   const params = {
     platform_ids:
       platformIds && platformIds.length > 0 ? platformIds : undefined,
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index 686dc4504..1e73d95fa 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -9,24 +9,9 @@ import type { CustomLimitOffsetPage_SimpleRomSchema_ as GetRomsResponse } from "
 import type { GetRomsParams } from "@/services/api/rom";
 import cacheService from "@/services/cache";
 import { getStatusKeyForText } from "@/utils";
+import { getFilterArray } from "@/utils/apiHelpers";
 
 class CachedApiService {
-  // Helper function to handle single vs multi-value parameters
-  private getFilterArray(
-    single: string | null | undefined,
-    multi: string[] | null | undefined,
-  ): string[] | undefined {
-    const result = (() => {
-      if (multi && multi.length > 0) return multi;
-      if (single) return [single];
-      return undefined;
-    })();
-    // Only log non-empty results to reduce console noise
-    if (result) {
-      console.log("CachedApiService getFilterArray - result:", result);
-    }
-    return result;
-  }
   private createRequestConfig(
     method: Method,
     url: string,
@@ -59,29 +44,23 @@ class CachedApiService {
       order_by: params.orderBy,
       order_dir: params.orderDir,
       group_by_meta_id: params.groupByMetaId,
-      genre: this.getFilterArray(params.selectedGenre, params.selectedGenres),
-      franchise: this.getFilterArray(
+      genre: getFilterArray(params.selectedGenre, params.selectedGenres),
+      franchise: getFilterArray(
         params.selectedFranchise,
         params.selectedFranchises,
       ),
-      collection: this.getFilterArray(
+      collection: getFilterArray(
         params.selectedCollection,
         params.selectedCollections,
       ),
-      company: this.getFilterArray(
-        params.selectedCompany,
-        params.selectedCompanies,
-      ),
-      age_rating: this.getFilterArray(
+      company: getFilterArray(params.selectedCompany, params.selectedCompanies),
+      age_rating: getFilterArray(
         params.selectedAgeRating,
         params.selectedAgeRatings,
       ),
       selected_status: getStatusKeyForText(params.selectedStatus ?? null),
-      region: this.getFilterArray(
-        params.selectedRegion,
-        params.selectedRegions,
-      ),
-      language: this.getFilterArray(
+      region: getFilterArray(params.selectedRegion, params.selectedRegions),
+      language: getFilterArray(
         params.selectedLanguage,
         params.selectedLanguages,
       ),
diff --git a/frontend/src/utils/apiHelpers.ts b/frontend/src/utils/apiHelpers.ts
new file mode 100644
index 000000000..fda168832
--- /dev/null
+++ b/frontend/src/utils/apiHelpers.ts
@@ -0,0 +1,18 @@
+/**
+ * Helper function to handle single vs multi-value parameters for API requests
+ */
+export function getFilterArray(
+  single: string | null | undefined,
+  multi: string[] | null | undefined,
+): string[] | undefined {
+  const result = (() => {
+    if (multi && multi.length > 0) return multi;
+    if (single) return [single];
+    return undefined;
+  })();
+  // Only log non-empty results to reduce console noise
+  if (result) {
+    console.log("getFilterArray - result:", result);
+  }
+  return result;
+}

From ca075804846753a3e8c2117560f6de71a2870ff0 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 28 Nov 2025 16:26:54 +0000
Subject: [PATCH 19/73] Refactor: streamline filter application logic and
 enhance multi-value support across API and frontend components

---
 backend/endpoints/rom.py                      |  1 -
 backend/handler/database/roms_handler.py      | 63 ++++----------
 .../AppBar/common/FilterDrawer/Base.vue       | 10 +--
 frontend/src/stores/roms.ts                   | 83 ++++---------------
 frontend/src/utils/apiHelpers.ts              |  4 -
 5 files changed, 37 insertions(+), 124 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index d9ee96a77..9acb39496 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -1,6 +1,5 @@
 import binascii
 import json
-import logging
 from base64 import b64encode
 from datetime import datetime, timezone
 from io import BytesIO
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index a2a14f0a5..54894ecf3 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -609,55 +609,22 @@ class DBRomsHandler(DBBaseHandler):
         if needs_metadata_join:
             query = query.outerjoin(RomMetadata)
 
-        # Apply metadata filters efficiently
-        if genres:
-            query = self.filter_by_genres(
-                query, session=session, values=genres, match_all=(genres_logic == "all")
-            )
-        if franchises:
-            query = self.filter_by_franchises(
-                query,
-                session=session,
-                values=franchises,
-                match_all=(franchises_logic == "all"),
-            )
-        if collections:
-            query = self.filter_by_collections(
-                query,
-                session=session,
-                values=collections,
-                match_all=(collections_logic == "all"),
-            )
-        if companies:
-            query = self.filter_by_companies(
-                query,
-                session=session,
-                values=companies,
-                match_all=(companies_logic == "all"),
-            )
-        if age_ratings:
-            query = self.filter_by_age_ratings(
-                query,
-                session=session,
-                values=age_ratings,
-                match_all=(age_ratings_logic == "all"),
-            )
+        # Apply metadata and rom-level filters efficiently
+        filters_to_apply = [
+            (genres, genres_logic, self.filter_by_genres),
+            (franchises, franchises_logic, self.filter_by_franchises),
+            (collections, collections_logic, self.filter_by_collections),
+            (companies, companies_logic, self.filter_by_companies),
+            (age_ratings, age_ratings_logic, self.filter_by_age_ratings),
+            (regions, regions_logic, self.filter_by_regions),
+            (languages, languages_logic, self.filter_by_languages),
+        ]
 
-        # Apply rom-level filters
-        if regions:
-            query = self.filter_by_regions(
-                query,
-                session=session,
-                values=regions,
-                match_all=(regions_logic == "all"),
-            )
-        if languages:
-            query = self.filter_by_languages(
-                query,
-                session=session,
-                values=languages,
-                match_all=(languages_logic == "all"),
-            )
+        for values, logic, filter_func in filters_to_apply:
+            if values:
+                query = filter_func(
+                    query, session=session, values=values, match_all=(logic == "all")
+                )
 
         # The RomUser table is already joined if user_id is set
         if selected_status and user_id:
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 0846bb1a1..ce67d3b2a 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -75,7 +75,6 @@ const {
   filterStatuses,
   selectedStatuses,
   statusesLogic,
-  selectedPlatform,
   selectedPlatforms,
   selectedRegion,
   filterRegions,
@@ -86,7 +85,6 @@ const {
   selectedLanguages,
   languagesLogic,
 } = storeToRefs(galleryFilterStore);
-const { filteredRoms } = storeToRefs(romsStore);
 const { allPlatforms } = storeToRefs(platformsStore);
 const emitter = inject<Emitter<Events>>("emitter");
 
@@ -304,12 +302,14 @@ async function fetchSearchFilteredRoms() {
   try {
     const params = {
       searchTerm: searchTerm.value,
-      platformId: romsStore.currentPlatform?.id ?? null,
+      platformIds: romsStore.currentPlatform
+        ? [romsStore.currentPlatform.id]
+        : null,
       collectionId: romsStore.currentCollection?.id ?? null,
       virtualCollectionId: romsStore.currentVirtualCollection?.id ?? null,
       smartCollectionId: romsStore.currentSmartCollection?.id ?? null,
-      limit: romsStore.fetchLimit,
-      offset: romsStore.fetchOffset,
+      limit: 10000, // Get enough ROMs to populate filters
+      offset: 0,
       orderBy: romsStore.orderBy,
       orderDir: romsStore.orderDir,
       // Exclude all other filters
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 5f3f0790b..ad26812c7 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -129,72 +129,23 @@ export default defineStore("roms", {
         filterRA: galleryFilter.filterRA,
         filterMissing: galleryFilter.filterMissing,
         filterVerified: galleryFilter.filterVerified,
-        // Single value filters (backward compatibility - only use if multiselect is empty)
-        selectedGenre:
-          galleryFilter.selectedGenres.length > 0
-            ? null
-            : galleryFilter.selectedGenre,
-        selectedFranchise:
-          galleryFilter.selectedFranchises.length > 0
-            ? null
-            : galleryFilter.selectedFranchise,
-        selectedCollection:
-          galleryFilter.selectedCollections.length > 0
-            ? null
-            : galleryFilter.selectedCollection,
-        selectedCompany:
-          galleryFilter.selectedCompanies.length > 0
-            ? null
-            : galleryFilter.selectedCompany,
-        selectedAgeRating:
-          galleryFilter.selectedAgeRatings.length > 0
-            ? null
-            : galleryFilter.selectedAgeRating,
-        selectedStatus:
-          galleryFilter.selectedStatuses.length > 0
-            ? null
-            : galleryFilter.selectedStatus,
-        selectedRegion:
-          galleryFilter.selectedRegions.length > 0
-            ? null
-            : galleryFilter.selectedRegion,
-        selectedLanguage:
-          galleryFilter.selectedLanguages.length > 0
-            ? null
-            : galleryFilter.selectedLanguage,
-        // Multi-value filters
-        selectedGenres:
-          galleryFilter.selectedGenres.length > 0
-            ? galleryFilter.selectedGenres
-            : null,
-        selectedFranchises:
-          galleryFilter.selectedFranchises.length > 0
-            ? galleryFilter.selectedFranchises
-            : null,
-        selectedCollections:
-          galleryFilter.selectedCollections.length > 0
-            ? galleryFilter.selectedCollections
-            : null,
-        selectedCompanies:
-          galleryFilter.selectedCompanies.length > 0
-            ? galleryFilter.selectedCompanies
-            : null,
-        selectedAgeRatings:
-          galleryFilter.selectedAgeRatings.length > 0
-            ? galleryFilter.selectedAgeRatings
-            : null,
-        selectedRegions:
-          galleryFilter.selectedRegions.length > 0
-            ? galleryFilter.selectedRegions
-            : null,
-        selectedLanguages:
-          galleryFilter.selectedLanguages.length > 0
-            ? galleryFilter.selectedLanguages
-            : null,
-        selectedStatuses:
-          galleryFilter.selectedStatuses.length > 0
-            ? galleryFilter.selectedStatuses
-            : null,
+        // Single and multi-value filters are handled by the API layer
+        selectedGenre: galleryFilter.selectedGenre,
+        selectedFranchise: galleryFilter.selectedFranchise,
+        selectedCollection: galleryFilter.selectedCollection,
+        selectedCompany: galleryFilter.selectedCompany,
+        selectedAgeRating: galleryFilter.selectedAgeRating,
+        selectedStatus: galleryFilter.selectedStatus,
+        selectedRegion: galleryFilter.selectedRegion,
+        selectedLanguage: galleryFilter.selectedLanguage,
+        selectedGenres: galleryFilter.selectedGenres,
+        selectedFranchises: galleryFilter.selectedFranchises,
+        selectedCollections: galleryFilter.selectedCollections,
+        selectedCompanies: galleryFilter.selectedCompanies,
+        selectedAgeRatings: galleryFilter.selectedAgeRatings,
+        selectedRegions: galleryFilter.selectedRegions,
+        selectedLanguages: galleryFilter.selectedLanguages,
+        selectedStatuses: galleryFilter.selectedStatuses,
         // Logic operators
         genresLogic: galleryFilter.genresLogic,
         franchisesLogic: galleryFilter.franchisesLogic,
diff --git a/frontend/src/utils/apiHelpers.ts b/frontend/src/utils/apiHelpers.ts
index fda168832..5345030e9 100644
--- a/frontend/src/utils/apiHelpers.ts
+++ b/frontend/src/utils/apiHelpers.ts
@@ -10,9 +10,5 @@ export function getFilterArray(
     if (single) return [single];
     return undefined;
   })();
-  // Only log non-empty results to reduce console noise
-  if (result) {
-    console.log("getFilterArray - result:", result);
-  }
   return result;
 }

From de95edfc8164634cf389f99ea3a1aff2040efb1c Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 28 Nov 2025 16:43:01 +0000
Subject: [PATCH 20/73] Refactor: remove unused selectedStatuses parameter from
 getRoms function

---
 frontend/src/services/api/rom.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index e9be28bd5..246fe7642 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -142,7 +142,6 @@ async function getRoms({
   selectedAgeRatings = null,
   selectedRegions = null,
   selectedLanguages = null,
-  selectedStatuses = null,
   // Logic operators
   genresLogic = null,
   franchisesLogic = null,

From 19fe6518fcc44dc254d0446eea71f7ed4facc8bd Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 28 Nov 2025 16:57:07 +0000
Subject: [PATCH 21/73] Refactor: update get_roms_scalar calls to support
 multi-value platform IDs

---
 backend/endpoints/feeds.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/endpoints/feeds.py b/backend/endpoints/feeds.py
index 87b86ab48..864c81111 100644
--- a/backend/endpoints/feeds.py
+++ b/backend/endpoints/feeds.py
@@ -436,7 +436,7 @@ def pkgi_psp_feed(
             status_code=400, detail=f"Invalid content type: {content_type}"
         ) from e
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=psp_platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[psp_platform.id])
     txt_lines = []
 
     for rom in roms:
@@ -505,7 +505,7 @@ def fpkgi_feed(request: Request, platform_slug: str) -> Response:
             status_code=404, detail=f"Platform {platform_slug} not found"
         )
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[platform.id])
     response_data = {}
 
     for rom in roms:
@@ -551,7 +551,7 @@ def kekatsu_ds_feed(request: Request, platform_slug: str) -> Response:
             status_code=404, detail=f"Platform {platform_slug} not found"
         )
 
-    roms = db_rom_handler.get_roms_scalar(platform_id=platform.id)
+    roms = db_rom_handler.get_roms_scalar(platform_ids=[platform.id])
 
     txt_lines = []
     txt_lines.append("1")  # Database version

From 92cb643405778b248464e5aa99906223ab4358f8 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 28 Nov 2025 17:04:43 +0000
Subject: [PATCH 22/73] Refactor: update filter criteria handling to support
 multi-value platform IDs and remove legacy conversion logic

---
 .../handler/database/collections_handler.py   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
index 7202c6a7d..52a3cdae3 100644
--- a/backend/handler/database/collections_handler.py
+++ b/backend/handler/database/collections_handler.py
@@ -214,25 +214,25 @@ class DBCollectionsHandler(DBBaseHandler):
         criteria = smart_collection.filter_criteria
 
         # Convert legacy single-value criteria to arrays for backward compatibility
-        def convert_legacy_filter(new_key: str, old_key: str) -> list[str] | None:
-            """Convert legacy single-value filter to array format."""
-            if new_value := criteria.get(new_key):
-                return new_value if isinstance(new_value, list) else [new_value]
-            if old_value := criteria.get(old_key):
-                return [old_value]
-            return None
+        # def convert_legacy_filter(new_key: str, old_key: str) -> list[str] | None:
+        #     """Convert legacy single-value filter to array format."""
+        #     if new_value := criteria.get(new_key):
+        #         return new_value if isinstance(new_value, list) else [new_value]
+        #     if old_value := criteria.get(old_key):
+        #         return [old_value]
+        #     return None
 
-        # Apply conversions
-        genres = convert_legacy_filter("genres", "selected_genre")
-        franchises = convert_legacy_filter("franchises", "selected_franchise")
-        collections = convert_legacy_filter("collections", "selected_collection")
-        companies = convert_legacy_filter("companies", "selected_company")
-        age_ratings = convert_legacy_filter("age_ratings", "selected_age_rating")
-        regions = convert_legacy_filter("regions", "selected_region")
-        languages = convert_legacy_filter("languages", "selected_language")
+        # # Apply conversions
+        # genres = convert_legacy_filter("genres", "selected_genre")
+        # franchises = convert_legacy_filter("franchises", "selected_franchise")
+        # collections = convert_legacy_filter("collections", "selected_collection")
+        # companies = convert_legacy_filter("companies", "selected_company")
+        # age_ratings = convert_legacy_filter("age_ratings", "selected_age_rating")
+        # regions = convert_legacy_filter("regions", "selected_region")
+        # languages = convert_legacy_filter("languages", "selected_language")
 
         # Use the existing filter_roms method with the stored criteria
-        platform_id = criteria.get("platform_id")
+        platform_id = criteria.get("platform_ids")
         platform_ids = [platform_id] if platform_id is not None else None
 
         return db_rom_handler.get_roms_scalar(
@@ -247,14 +247,14 @@ class DBCollectionsHandler(DBBaseHandler):
             has_ra=criteria.get("has_ra"),
             missing=criteria.get("missing"),
             verified=criteria.get("verified"),
-            genres=genres,
-            franchises=franchises,
-            collections=collections,
-            companies=companies,
-            age_ratings=age_ratings,
+            genres=criteria.get("genres"),
+            franchises=criteria.get("franchises"),
+            collections=criteria.get("collections"),
+            companies=criteria.get("companies"),
+            age_ratings=criteria.get("age_ratings"),
             selected_status=criteria.get("selected_status"),
-            regions=regions,
-            languages=languages,
+            regions=criteria.get("regions"),
+            languages=criteria.get("languages"),
             user_id=user_id,
             order_by=criteria.get("order_by", "name"),
             order_dir=criteria.get("order_dir", "asc"),

From b2a571068bf8e189be2a820b7a74fb59e2a12958 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 28 Nov 2025 19:04:29 +0000
Subject: [PATCH 23/73] Refactor: remove max_length constraints from query
 parameters and update boolean filter values to use true/false strings

---
 backend/endpoints/rom.py                      |  14 ---
 backend/handler/database/roms_handler.py      |   6 +-
 .../AppBar/common/FilterDrawer/Base.vue       | 107 +++++++++---------
 3 files changed, 56 insertions(+), 71 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 9acb39496..2975f373e 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -267,7 +267,6 @@ def get_roms(
                 " returned. Maximum 50 values allowed."
             ),
             alias="genre",
-            max_length=50,
         ),
     ] = None,
     franchises: Annotated[
@@ -279,7 +278,6 @@ def get_roms(
                 " be returned. Maximum 50 values allowed."
             ),
             alias="franchise",
-            max_length=50,
         ),
     ] = None,
     collections: Annotated[
@@ -291,7 +289,6 @@ def get_roms(
                 " values will be returned. Maximum 50 values allowed."
             ),
             alias="collection",
-            max_length=50,
         ),
     ] = None,
     companies: Annotated[
@@ -303,7 +300,6 @@ def get_roms(
                 " be returned. Maximum 50 values allowed."
             ),
             alias="company",
-            max_length=50,
         ),
     ] = None,
     age_ratings: Annotated[
@@ -315,7 +311,6 @@ def get_roms(
                 " values will be returned. Maximum 20 values allowed."
             ),
             alias="age_rating",
-            max_length=20,
         ),
     ] = None,
     selected_status: Annotated[
@@ -331,7 +326,6 @@ def get_roms(
                 " values will be returned. Maximum 30 values allowed."
             ),
             alias="region",
-            max_length=30,
         ),
     ] = None,
     languages: Annotated[
@@ -343,7 +337,6 @@ def get_roms(
                 " values will be returned. Maximum 30 values allowed."
             ),
             alias="language",
-            max_length=30,
         ),
     ] = None,
     order_by: Annotated[
@@ -359,49 +352,42 @@ def get_roms(
         str,
         Query(
             description="Logic operator for genres filter: 'any' (OR) or 'all' (AND).",
-            alias="genres_logic",
         ),
     ] = "any",
     franchises_logic: Annotated[
         str,
         Query(
             description="Logic operator for franchises filter: 'any' (OR) or 'all' (AND).",
-            alias="franchises_logic",
         ),
     ] = "any",
     collections_logic: Annotated[
         str,
         Query(
             description="Logic operator for collections filter: 'any' (OR) or 'all' (AND).",
-            alias="collections_logic",
         ),
     ] = "any",
     companies_logic: Annotated[
         str,
         Query(
             description="Logic operator for companies filter: 'any' (OR) or 'all' (AND).",
-            alias="companies_logic",
         ),
     ] = "any",
     age_ratings_logic: Annotated[
         str,
         Query(
             description="Logic operator for age ratings filter: 'any' (OR) or 'all' (AND).",
-            alias="age_ratings_logic",
         ),
     ] = "any",
     regions_logic: Annotated[
         str,
         Query(
             description="Logic operator for regions filter: 'any' (OR) or 'all' (AND).",
-            alias="regions_logic",
         ),
     ] = "any",
     languages_logic: Annotated[
         str,
         Query(
             description="Logic operator for languages filter: 'any' (OR) or 'all' (AND).",
-            alias="languages_logic",
         ),
     ] = "any",
 ) -> CustomLimitOffsetPage[SimpleRomSchema]:
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 54894ecf3..44567a30d 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -239,7 +239,11 @@ class DBRomsHandler(DBBaseHandler):
         )
 
     def filter_by_matched(self, query: Query, value: bool) -> Query:
-        """Filter based on whether the rom is matched to a metadata provider."""
+        """Filter based on whether the rom is matched to a metadata provider.
+
+        Args:
+            value: True for matched ROMs, False for unmatched ROMs
+        """
         predicate = or_(
             Rom.igdb_id.isnot(None),
             Rom.moby_id.isnot(None),
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index ce67d3b2a..42124f386 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -99,42 +99,46 @@ const onFilterChange = debounce(
       search: searchTerm.value,
       matched:
         filterMatched.value === true
-          ? "1"
+          ? "true"
           : filterUnmatched.value === true
-            ? "2"
+            ? "false"
             : null,
       filterFavorites:
         filterFavorites.value === true
-          ? "1"
+          ? "true"
           : filterFavorites.value === false
-            ? "0"
+            ? "false"
             : null,
       filterDuplicates:
         filterDuplicates.value === true
-          ? "1"
+          ? "true"
           : filterDuplicates.value === false
-            ? "0"
+            ? "false"
             : null,
       filterPlayables:
         filterPlayables.value === true
-          ? "1"
+          ? "true"
           : filterPlayables.value === false
-            ? "0"
+            ? "false"
             : null,
       filterMissing:
         filterMissing.value === true
-          ? "1"
+          ? "true"
           : filterMissing.value === false
-            ? "0"
+            ? "false"
             : null,
       filterVerified:
         filterVerified.value === true
-          ? "1"
+          ? "true"
           : filterVerified.value === false
-            ? "0"
+            ? "false"
             : null,
       filterRA:
-        filterRA.value === true ? "1" : filterRA.value === false ? "0" : null,
+        filterRA.value === true
+          ? "true"
+          : filterRA.value === false
+            ? "false"
+            : null,
       platforms:
         selectedPlatforms.value.length > 0
           ? selectedPlatforms.value.map((p) => String(p.id)).join(",")
@@ -313,7 +317,6 @@ async function fetchSearchFilteredRoms() {
       orderBy: romsStore.orderBy,
       orderDir: romsStore.orderDir,
       // Exclude all other filters
-      filterUnmatched: false,
       filterMatched: false,
       filterFavorites: null,
       filterDuplicates: null,
@@ -436,62 +439,54 @@ onMounted(async () => {
 
   // Check for query params to set filters
   if (urlMatched !== undefined) {
-    if (urlMatched === "1") {
+    if (urlMatched) {
       galleryFilterStore.setFilterMatched(true);
-    } else if (urlMatched === "2") {
-      galleryFilterStore.setFilterUnmatched(true);
+    } else {
+      galleryFilterStore.setFilterMatched(false);
     }
-    // urlMatched === "0" or any other value means no filter (both remain null)
+    // Any other value means no filter (both remain null)
   }
   if (urlFilteredFavorites !== undefined) {
-    galleryFilterStore.setFilterFavorites(
-      urlFilteredFavorites === "1"
-        ? true
-        : urlFilteredFavorites === "0"
-          ? false
-          : null,
-    );
+    if (urlFilteredFavorites) {
+      galleryFilterStore.setFilterFavorites(true);
+    } else {
+      galleryFilterStore.setFilterFavorites(false);
+    }
   }
   if (urlFilteredDuplicates !== undefined) {
-    galleryFilterStore.setFilterDuplicates(
-      urlFilteredDuplicates === "1"
-        ? true
-        : urlFilteredDuplicates === "0"
-          ? false
-          : null,
-    );
+    if (urlFilteredDuplicates) {
+      galleryFilterStore.setFilterDuplicates(true);
+    } else {
+      galleryFilterStore.setFilterDuplicates(false);
+    }
   }
   if (urlFilteredPlayables !== undefined) {
-    galleryFilterStore.setFilterPlayables(
-      urlFilteredPlayables === "1"
-        ? true
-        : urlFilteredPlayables === "0"
-          ? false
-          : null,
-    );
+    if (urlFilteredPlayables) {
+      galleryFilterStore.setFilterPlayables(true);
+    } else {
+      galleryFilterStore.setFilterPlayables(false);
+    }
   }
   if (urlFilteredMissing !== undefined) {
-    galleryFilterStore.setFilterMissing(
-      urlFilteredMissing === "1"
-        ? true
-        : urlFilteredMissing === "0"
-          ? false
-          : null,
-    );
+    if (urlFilteredMissing) {
+      galleryFilterStore.setFilterMissing(true);
+    } else {
+      galleryFilterStore.setFilterMissing(false);
+    }
   }
   if (urlFilteredVerified !== undefined) {
-    galleryFilterStore.setFilterVerified(
-      urlFilteredVerified === "1"
-        ? true
-        : urlFilteredVerified === "0"
-          ? false
-          : null,
-    );
+    if (urlFilteredVerified) {
+      galleryFilterStore.setFilterVerified(true);
+    } else {
+      galleryFilterStore.setFilterVerified(false);
+    }
   }
   if (urlFilteredRa !== undefined) {
-    galleryFilterStore.setFilterRA(
-      urlFilteredRa === "1" ? true : urlFilteredRa === "0" ? false : null,
-    );
+    if (urlFilteredRa) {
+      galleryFilterStore.setFilterRA(true);
+    } else {
+      galleryFilterStore.setFilterRA(false);
+    }
   }
   // Check for query params to set multi-value filters (prioritize over single values)
   if (urlPlatforms !== undefined) {

From 590eec0632796a047a1d14575e517528a462f723 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 28 Nov 2025 19:16:15 +0000
Subject: [PATCH 24/73] Refactor: remove filterUnmatched references and update
 filterMatched handling to support null values

---
 .../AppBar/common/ContextualRandomBtn.vue     |  2 -
 .../AppBar/common/FilterDrawer/Base.vue       |  3 +-
 .../FilterDrawer/FilterMatchStateBtn.vue      | 37 +++++++---------
 .../Dialog/CreateSmartCollection.vue          |  3 --
 frontend/src/services/api/rom.ts              | 15 +++----
 frontend/src/services/cache/api.ts            |  5 ++-
 frontend/src/stores/galleryFilter.ts          | 42 +++++++++++--------
 frontend/src/stores/roms.ts                   |  1 -
 8 files changed, 49 insertions(+), 59 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue b/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue
index 8b1e91ab2..7c7231219 100644
--- a/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue
@@ -24,7 +24,6 @@ const {
 
 const {
   searchTerm,
-  filterUnmatched,
   filterMatched,
   filterFavorites,
   filterDuplicates,
@@ -55,7 +54,6 @@ async function goToRandomGame() {
         searchTerm.value && searchTerm.value.trim()
           ? searchTerm.value.trim()
           : null,
-      filterUnmatched: filterUnmatched.value,
       filterMatched: filterMatched.value,
       filterFavorites: filterFavorites.value,
       filterDuplicates: filterDuplicates.value,
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 42124f386..5cbcee3b5 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -43,7 +43,6 @@ const platformsStore = storePlatforms();
 const {
   searchTerm,
   activeFilterDrawer,
-  filterUnmatched,
   filterMatched,
   filterFavorites,
   filterDuplicates,
@@ -100,7 +99,7 @@ const onFilterChange = debounce(
       matched:
         filterMatched.value === true
           ? "true"
-          : filterUnmatched.value === true
+          : filterMatched.value === false
             ? "false"
             : null,
       filterFavorites:
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
index 7bb97cce8..5983c566e 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMatchStateBtn.vue
@@ -9,30 +9,23 @@ import type { Events } from "@/types/emitter";
 
 const { t } = useI18n();
 const galleryFilterStore = storeGalleryFilter();
-const { filterMatched, filterUnmatched } = storeToRefs(galleryFilterStore);
+const { filterMatched } = storeToRefs(galleryFilterStore);
 const emitter = inject<Emitter<Events>>("emitter");
 
 // Computed property to determine current state
-const matchState = computed(() => {
-  if (filterMatched.value) return "matched";
-  if (filterUnmatched.value) return "unmatched";
-  return "all";
+const currentState = computed(() => {
+  if (filterMatched.value === true) return "matched";
+  if (filterMatched.value === false) return "unmatched";
+  return "all"; // null
 });
 
 // Handler for state changes
-function setMatchState(state: string) {
-  switch (state) {
-    case "matched":
-      galleryFilterStore.setFilterMatched(true);
-      break;
-    case "unmatched":
-      galleryFilterStore.setFilterUnmatched(true);
-      break;
-    default: // "all"
-      galleryFilterStore.setFilterMatched(false);
-      galleryFilterStore.setFilterUnmatched(false);
-      break;
-  }
+function setState(state: string | null) {
+  if (!state) return;
+
+  galleryFilterStore.setFilterMatchedState(
+    state as "all" | "matched" | "unmatched",
+  );
   emitter?.emit("filterRoms", null);
 }
 </script>
@@ -41,14 +34,14 @@ function setMatchState(state: string) {
   <div class="d-flex align-center justify-space-between py-2">
     <div class="d-flex align-center">
       <v-icon
-        :color="matchState !== 'all' ? 'primary' : 'grey-lighten-1'"
+        :color="currentState !== 'all' ? 'primary' : 'grey-lighten-1'"
         class="mr-3"
       >
         mdi-file-search-outline
       </v-icon>
       <span
         :class="
-          matchState !== 'all'
+          currentState !== 'all'
             ? 'text-primary font-weight-medium'
             : 'text-medium-emphasis'
         "
@@ -58,11 +51,11 @@ function setMatchState(state: string) {
       </span>
     </div>
     <v-btn-toggle
-      :model-value="matchState"
+      :model-value="currentState"
       color="primary"
       density="compact"
       variant="outlined"
-      @update:model-value="setMatchState"
+      @update:model-value="setState"
     >
       <v-btn value="all" size="small"
         ><v-icon size="x-large">mdi-cancel</v-icon>
diff --git a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
index 7169568cc..f8569eae8 100644
--- a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
+++ b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
@@ -26,7 +26,6 @@ const isPublic = ref(false);
 
 const {
   searchTerm,
-  filterUnmatched,
   filterMatched,
   filterFavorites,
   filterDuplicates,
@@ -67,7 +66,6 @@ const filterSummary = computed(() => {
   if (selectedPlatform.value)
     filters.push(`Platform: ${selectedPlatform.value.name}`);
   if (filterMatched.value) filters.push("Matched only");
-  if (filterUnmatched.value) filters.push("Unmatched only");
   if (filterFavorites.value) filters.push("Favorites");
   if (filterDuplicates.value) filters.push("Duplicates");
   if (filterPlayables.value) filters.push("Playable");
@@ -123,7 +121,6 @@ async function createSmartCollection() {
     if (selectedPlatform.value)
       filterCriteria.platform_id = selectedPlatform.value.id;
     if (filterMatched.value) filterCriteria.matched = true;
-    if (filterUnmatched.value) filterCriteria.matched = false;
     if (filterFavorites.value) filterCriteria.favorite = true;
     if (filterDuplicates.value) filterCriteria.duplicate = true;
     if (filterPlayables.value) filterCriteria.playable = true;
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 246fe7642..e77d0ef7d 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -71,8 +71,7 @@ export interface GetRomsParams {
   offset?: number;
   orderBy?: string | null;
   orderDir?: string | null;
-  filterUnmatched?: boolean;
-  filterMatched?: boolean;
+  filterMatched?: boolean | null;
   filterFavorites?: boolean | null;
   filterDuplicates?: boolean | null;
   filterPlayables?: boolean | null;
@@ -118,11 +117,10 @@ async function getRoms({
   offset = 0,
   orderBy = "name",
   orderDir = "asc",
-  filterUnmatched = false,
-  filterMatched = false,
-  filterFavorites = false,
-  filterDuplicates = false,
-  filterPlayables = false,
+  filterMatched = null,
+  filterFavorites = null,
+  filterDuplicates = null,
+  filterPlayables = null,
   filterRA = false,
   filterMissing = false,
   filterVerified = false,
@@ -200,8 +198,7 @@ async function getRoms({
       selectedLanguages && selectedLanguages.length > 1
         ? languagesLogic || "any"
         : undefined,
-    ...(filterUnmatched ? { matched: false } : {}),
-    ...(filterMatched ? { matched: true } : {}),
+    ...(filterMatched !== null ? { matched: filterMatched } : {}),
     ...(filterFavorites !== null ? { favorite: filterFavorites } : {}),
     ...(filterDuplicates !== null ? { duplicate: filterDuplicates } : {}),
     ...(filterPlayables !== null ? { playable: filterPlayables } : {}),
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index 1e73d95fa..1dc0bc92d 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -93,8 +93,9 @@ class CachedApiService {
         params.selectedLanguages && params.selectedLanguages.length > 1
           ? params.languagesLogic || "any"
           : undefined,
-      ...(params.filterUnmatched ? { matched: false } : {}),
-      ...(params.filterMatched ? { matched: true } : {}),
+      ...(params.filterMatched !== null
+        ? { matched: params.filterMatched }
+        : {}),
       ...(params.filterFavorites !== null
         ? { favorite: params.filterFavorites }
         : {}),
diff --git a/frontend/src/stores/galleryFilter.ts b/frontend/src/stores/galleryFilter.ts
index bff511a64..bea53fb94 100644
--- a/frontend/src/stores/galleryFilter.ts
+++ b/frontend/src/stores/galleryFilter.ts
@@ -26,8 +26,7 @@ const defaultFilterState = {
   filterRegions: [] as string[],
   filterLanguages: [] as string[],
   filterStatuses: Object.values(romStatusMap).map((status) => status.text),
-  filterUnmatched: false,
-  filterMatched: false,
+  filterMatched: null as boolean | null, // null = all, true = matched, false = unmatched
   filterFavorites: null as boolean | null, // null = all, true = favorites, false = not favorites
   filterDuplicates: null as boolean | null, // null = all, true = duplicates, false = not duplicates
   filterPlayables: null as boolean | null, // null = all, true = playables, false = not playables
@@ -176,21 +175,30 @@ export default defineStore("galleryFilter", {
     setStatusesLogic(logic: "any" | "all") {
       this.statusesLogic = logic;
     },
-    setFilterUnmatched(value: boolean) {
-      this.filterUnmatched = value;
-      this.filterMatched = false;
-    },
-    switchFilterUnmatched() {
-      this.filterUnmatched = !this.filterUnmatched;
-      this.filterMatched = false;
-    },
-    setFilterMatched(value: boolean) {
+    setFilterMatched(value: boolean | null) {
       this.filterMatched = value;
-      this.filterUnmatched = false;
+    },
+    setFilterMatchedState(state: "all" | "matched" | "unmatched") {
+      switch (state) {
+        case "matched":
+          this.filterMatched = true;
+          break;
+        case "unmatched":
+          this.filterMatched = false;
+          break;
+        default: // "all"
+          this.filterMatched = null;
+          break;
+      }
     },
     switchFilterMatched() {
-      this.filterMatched = !this.filterMatched;
-      this.filterUnmatched = false;
+      if (this.filterMatched === null) {
+        this.filterMatched = true;
+      } else if (this.filterMatched === true) {
+        this.filterMatched = false;
+      } else {
+        this.filterMatched = null;
+      }
     },
     setFilterFavorites(value: boolean | null) {
       this.filterFavorites = value;
@@ -344,8 +352,7 @@ export default defineStore("galleryFilter", {
     },
     isFiltered() {
       return Boolean(
-        this.filterUnmatched ||
-          this.filterMatched ||
+        this.filterMatched !== null ||
           this.filterFavorites !== null ||
           this.filterDuplicates !== null ||
           this.filterPlayables !== null ||
@@ -394,8 +401,7 @@ export default defineStore("galleryFilter", {
       this.selectedLanguages = [];
       this.selectedStatus = null;
       this.selectedStatuses = [];
-      this.filterUnmatched = false;
-      this.filterMatched = false;
+      this.filterMatched = null;
       this.filterFavorites = null;
       this.filterDuplicates = null;
       this.filterPlayables = null;
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index ad26812c7..0ae1dd4b5 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -121,7 +121,6 @@ export default defineStore("roms", {
         orderBy: this.orderBy,
         orderDir: this.orderDir,
         groupByMetaId: this._shouldGroupRoms() && this.onGalleryView,
-        filterUnmatched: galleryFilter.filterUnmatched,
         filterMatched: galleryFilter.filterMatched,
         filterFavorites: galleryFilter.filterFavorites,
         filterDuplicates: galleryFilter.filterDuplicates,

From bc73f07537fbaaab04004450baa99b7bda114a23 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 28 Nov 2025 22:36:21 +0000
Subject: [PATCH 25/73] Refactor: enhance filter criteria handling to support
 multi-value selections for genres, franchises, collections, companies, age
 ratings, regions, and languages

---
 .../handler/database/collections_handler.py   | 50 ++++++++++---------
 .../Dialog/CreateSmartCollection.vue          | 32 ++++++------
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
index 52a3cdae3..fb7e2fbfb 100644
--- a/backend/handler/database/collections_handler.py
+++ b/backend/handler/database/collections_handler.py
@@ -214,26 +214,28 @@ class DBCollectionsHandler(DBBaseHandler):
         criteria = smart_collection.filter_criteria
 
         # Convert legacy single-value criteria to arrays for backward compatibility
-        # def convert_legacy_filter(new_key: str, old_key: str) -> list[str] | None:
-        #     """Convert legacy single-value filter to array format."""
-        #     if new_value := criteria.get(new_key):
-        #         return new_value if isinstance(new_value, list) else [new_value]
-        #     if old_value := criteria.get(old_key):
-        #         return [old_value]
-        #     return None
+        def convert_legacy_filter(new_key: str, old_key: str) -> list[str] | None:
+            """Convert legacy single-value filter to array format."""
+            if new_value := criteria.get(new_key):
+                return new_value if isinstance(new_value, list) else [new_value]
+            if old_value := criteria.get(old_key):
+                return [old_value]
+            return None
 
-        # # Apply conversions
-        # genres = convert_legacy_filter("genres", "selected_genre")
-        # franchises = convert_legacy_filter("franchises", "selected_franchise")
-        # collections = convert_legacy_filter("collections", "selected_collection")
-        # companies = convert_legacy_filter("companies", "selected_company")
-        # age_ratings = convert_legacy_filter("age_ratings", "selected_age_rating")
-        # regions = convert_legacy_filter("regions", "selected_region")
-        # languages = convert_legacy_filter("languages", "selected_language")
+        # Apply conversions
+        genres = convert_legacy_filter("genres", "selected_genre")
+        franchises = convert_legacy_filter("franchises", "selected_franchise")
+        collections = convert_legacy_filter("collections", "selected_collection")
+        companies = convert_legacy_filter("companies", "selected_company")
+        age_ratings = convert_legacy_filter("age_ratings", "selected_age_rating")
+        regions = convert_legacy_filter("regions", "selected_region")
+        languages = convert_legacy_filter("languages", "selected_language")
 
         # Use the existing filter_roms method with the stored criteria
-        platform_id = criteria.get("platform_ids")
-        platform_ids = [platform_id] if platform_id is not None else None
+        platform_ids = criteria.get("platform_ids")
+        if platform_ids is None:
+            if platform_id := criteria.get("platform_id"):
+                platform_ids = [platform_id]
 
         return db_rom_handler.get_roms_scalar(
             platform_ids=platform_ids,
@@ -247,14 +249,14 @@ class DBCollectionsHandler(DBBaseHandler):
             has_ra=criteria.get("has_ra"),
             missing=criteria.get("missing"),
             verified=criteria.get("verified"),
-            genres=criteria.get("genres"),
-            franchises=criteria.get("franchises"),
-            collections=criteria.get("collections"),
-            companies=criteria.get("companies"),
-            age_ratings=criteria.get("age_ratings"),
+            genres=genres,
+            franchises=franchises,
+            collections=collections,
+            companies=companies,
+            age_ratings=age_ratings,
             selected_status=criteria.get("selected_status"),
-            regions=criteria.get("regions"),
-            languages=criteria.get("languages"),
+            regions=regions,
+            languages=languages,
             user_id=user_id,
             order_by=criteria.get("order_by", "name"),
             order_dir=criteria.get("order_dir", "asc"),
diff --git a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
index f8569eae8..afdc346f0 100644
--- a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
+++ b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
@@ -127,22 +127,24 @@ async function createSmartCollection() {
     if (filterRA.value) filterCriteria.has_ra = true;
     if (filterMissing.value) filterCriteria.missing = true;
     if (filterVerified.value) filterCriteria.verified = true;
-    if (selectedGenre.value) filterCriteria.genres = [selectedGenre.value];
-    if (selectedFranchise.value)
-      filterCriteria.franchises = [selectedFranchise.value];
-    if (selectedCollection.value)
-      filterCriteria.collections = [selectedCollection.value];
-    if (selectedCompany.value)
-      filterCriteria.companies = [selectedCompany.value];
-    if (selectedAgeRating.value)
-      filterCriteria.age_ratings = [selectedAgeRating.value];
-    if (selectedStatus.value)
-      filterCriteria.selected_status = getStatusKeyForText(
-        selectedStatus.value,
+    if (selectedGenre.value && selectedGenre.value.length > 0)
+      filterCriteria.genres = selectedGenre.value;
+    if (selectedFranchise.value && selectedFranchise.value.length > 0)
+      filterCriteria.franchises = selectedFranchise.value;
+    if (selectedCollection.value && selectedCollection.value.length > 0)
+      filterCriteria.collections = selectedCollection.value;
+    if (selectedCompany.value && selectedCompany.value.length > 0)
+      filterCriteria.companies = selectedCompany.value;
+    if (selectedAgeRating.value && selectedAgeRating.value.length > 0)
+      filterCriteria.age_ratings = selectedAgeRating.value;
+    if (selectedStatus.value && selectedStatus.value.length > 0)
+      filterCriteria.selected_status = selectedStatus.value.map((s) =>
+        getStatusKeyForText(s),
       );
-    if (selectedRegion.value) filterCriteria.regions = [selectedRegion.value];
-    if (selectedLanguage.value)
-      filterCriteria.languages = [selectedLanguage.value];
+    if (selectedRegion.value && selectedRegion.value.length > 0)
+      filterCriteria.regions = selectedRegion.value;
+    if (selectedLanguage.value && selectedLanguage.value.length > 0)
+      filterCriteria.languages = selectedLanguage.value;
 
     const { data } = await collectionApi.createSmartCollection({
       smartCollection: {

From d15db3c97bd61df1ed604f0b21db3d53a7e3e0fd Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Mon, 1 Dec 2025 16:57:21 +0000
Subject: [PATCH 26/73] Refactor: update query parameter descriptions for
 clarity and reintroduce order_by and order_dir parameters

---
 backend/endpoints/rom.py | 54 ++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 2975f373e..6bf86c8b2 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -205,8 +205,7 @@ def get_roms(
         Query(
             description=(
                 "Platform internal ids. Multiple values are allowed by repeating the"
-                " parameter, and results that match any of the values will be"
-                " returned. Maximum 20 values allowed."
+                " parameter, and results that match any of the values will be returned."
             ),
         ),
     ] = None,
@@ -224,7 +223,7 @@ def get_roms(
     ] = None,
     matched: Annotated[
         bool | None,
-        Query(description="Whether the rom matched a metadata source."),
+        Query(description="Whether the rom matched at least one metadata source."),
     ] = None,
     favorite: Annotated[
         bool | None,
@@ -248,9 +247,7 @@ def get_roms(
     ] = None,
     verified: Annotated[
         bool | None,
-        Query(
-            description="Whether the rom is verified by Hasheous from the filesystem."
-        ),
+        Query(description="Whether the rom is verified by Hasheous."),
     ] = None,
     group_by_meta_id: Annotated[
         bool,
@@ -263,8 +260,7 @@ def get_roms(
         Query(
             description=(
                 "Associated genre. Multiple values are allowed by repeating the"
-                " parameter, and results that match any of the values will be"
-                " returned. Maximum 50 values allowed."
+                " parameter, and results that match any of the values will be returned."
             ),
             alias="genre",
         ),
@@ -274,8 +270,7 @@ def get_roms(
         Query(
             description=(
                 "Associated franchise. Multiple values are allowed by repeating"
-                " the parameter, and results that match any of the values will"
-                " be returned. Maximum 50 values allowed."
+                " the parameter, and results that match any of the values will be returned."
             ),
             alias="franchise",
         ),
@@ -284,9 +279,8 @@ def get_roms(
         list[str] | None,
         Query(
             description=(
-                "Associated collection. Multiple values are allowed by"
-                " repeating the parameter, and results that match any of the"
-                " values will be returned. Maximum 50 values allowed."
+                "Associated collection. Multiple values are allowed by repeating"
+                " the parameter, and results that match any of the values will be returned."
             ),
             alias="collection",
         ),
@@ -296,8 +290,7 @@ def get_roms(
         Query(
             description=(
                 "Associated company. Multiple values are allowed by repeating"
-                " the parameter, and results that match any of the values will"
-                " be returned. Maximum 50 values allowed."
+                " the parameter, and results that match any of the values will be returned."
             ),
             alias="company",
         ),
@@ -306,9 +299,8 @@ def get_roms(
         list[str] | None,
         Query(
             description=(
-                "Associated age rating. Multiple values are allowed by"
-                " repeating the parameter, and results that match any of the"
-                " values will be returned. Maximum 20 values allowed."
+                "Associated age rating. Multiple values are allowed by repeating"
+                " the parameter, and results that match any of the values will be returned."
             ),
             alias="age_rating",
         ),
@@ -321,9 +313,8 @@ def get_roms(
         list[str] | None,
         Query(
             description=(
-                "Associated region tag. Multiple values are allowed by"
-                " repeating the parameter, and results that match any of the"
-                " values will be returned. Maximum 30 values allowed."
+                "Associated region tag. Multiple values are allowed by repeating"
+                " the parameter, and results that match any of the values will be returned."
             ),
             alias="region",
         ),
@@ -332,21 +323,12 @@ def get_roms(
         list[str] | None,
         Query(
             description=(
-                "Associated language tag. Multiple values are allowed by"
-                " repeating the parameter, and results that match any of the"
-                " values will be returned. Maximum 30 values allowed."
+                "Associated language tag. Multiple values are allowed by repeating"
+                " the parameter, and results that match any of the values will be returned."
             ),
             alias="language",
         ),
     ] = None,
-    order_by: Annotated[
-        str,
-        Query(description="Field to order results by."),
-    ] = "name",
-    order_dir: Annotated[
-        str,
-        Query(description="Order direction, either 'asc' or 'desc'."),
-    ] = "asc",
     # Logic operators for multi-value filters
     genres_logic: Annotated[
         str,
@@ -390,6 +372,14 @@ def get_roms(
             description="Logic operator for languages filter: 'any' (OR) or 'all' (AND).",
         ),
     ] = "any",
+    order_by: Annotated[
+        str,
+        Query(description="Field to order results by."),
+    ] = "name",
+    order_dir: Annotated[
+        str,
+        Query(description="Order direction, either 'asc' or 'desc'."),
+    ] = "asc",
 ) -> CustomLimitOffsetPage[SimpleRomSchema]:
     """Retrieve roms."""
     query, order_by_attr = db_rom_handler.get_roms_query(

From cf837383f4a6bfa4ae82395fede6af0c72a63d20 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Mon, 1 Dec 2025 17:10:46 +0000
Subject: [PATCH 27/73] Refactor: update filter handling to support multi-value
 selections for platforms, genres, franchises, collections, companies, age
 ratings, statuses, regions, and languages

---
 .../AppBar/common/FilterDrawer/Base.vue       | 53 ++++++----
 .../Dialog/CreateSmartCollection.vue          | 99 ++++++++++---------
 2 files changed, 88 insertions(+), 64 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 5cbcee3b5..ddb040b05 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -315,24 +315,23 @@ async function fetchSearchFilteredRoms() {
       offset: 0,
       orderBy: romsStore.orderBy,
       orderDir: romsStore.orderDir,
-      // Exclude all other filters
-      filterMatched: false,
+      // Exclude all other filters to get comprehensive filter options
+      filterMatched: null,
       filterFavorites: null,
       filterDuplicates: null,
       filterPlayables: null,
       filterRA: null,
       filterMissing: null,
       filterVerified: null,
-      // Single value filters - exclude
+      // Exclude all single and multi-value filters to get all possible options
       selectedGenre: null,
       selectedFranchise: null,
       selectedCollection: null,
       selectedCompany: null,
       selectedAgeRating: null,
+      selectedStatus: null,
       selectedRegion: null,
       selectedLanguage: null,
-      selectedStatus: null,
-      // Multi-value filters - exclude
       selectedGenres: null,
       selectedFranchises: null,
       selectedCollections: null,
@@ -340,6 +339,7 @@ async function fetchSearchFilteredRoms() {
       selectedAgeRatings: null,
       selectedRegions: null,
       selectedLanguages: null,
+      selectedStatuses: null,
     };
 
     // Fetch ROMs with only search term applied (and current platform/collection context)
@@ -394,6 +394,7 @@ function setFilters() {
   galleryFilterStore.setFilterLanguages([
     ...new Set(romsForFilters.flatMap((rom) => rom.languages).sort()),
   ]);
+  // Note: filterStatuses is static and doesn't need to be set dynamically
 }
 
 onMounted(async () => {
@@ -438,53 +439,65 @@ onMounted(async () => {
 
   // Check for query params to set filters
   if (urlMatched !== undefined) {
-    if (urlMatched) {
+    if (urlMatched === "true") {
       galleryFilterStore.setFilterMatched(true);
-    } else {
-      galleryFilterStore.setFilterMatched(false);
+    } else if (urlMatched === "false") {
+      galleryFilterStore.setFilterUnmatched(true);
     }
     // Any other value means no filter (both remain null)
   }
   if (urlFilteredFavorites !== undefined) {
-    if (urlFilteredFavorites) {
+    if (urlFilteredFavorites === "true") {
       galleryFilterStore.setFilterFavorites(true);
-    } else {
+    } else if (urlFilteredFavorites === "false") {
       galleryFilterStore.setFilterFavorites(false);
+    } else {
+      galleryFilterStore.setFilterFavorites(null);
     }
   }
   if (urlFilteredDuplicates !== undefined) {
-    if (urlFilteredDuplicates) {
+    if (urlFilteredDuplicates === "true") {
       galleryFilterStore.setFilterDuplicates(true);
-    } else {
+    } else if (urlFilteredDuplicates === "false") {
       galleryFilterStore.setFilterDuplicates(false);
+    } else {
+      galleryFilterStore.setFilterDuplicates(null);
     }
   }
   if (urlFilteredPlayables !== undefined) {
-    if (urlFilteredPlayables) {
+    if (urlFilteredPlayables === "true") {
       galleryFilterStore.setFilterPlayables(true);
-    } else {
+    } else if (urlFilteredPlayables === "false") {
       galleryFilterStore.setFilterPlayables(false);
+    } else {
+      galleryFilterStore.setFilterPlayables(null);
     }
   }
   if (urlFilteredMissing !== undefined) {
-    if (urlFilteredMissing) {
+    if (urlFilteredMissing === "true") {
       galleryFilterStore.setFilterMissing(true);
-    } else {
+    } else if (urlFilteredMissing === "false") {
       galleryFilterStore.setFilterMissing(false);
+    } else {
+      galleryFilterStore.setFilterMissing(null);
     }
   }
   if (urlFilteredVerified !== undefined) {
-    if (urlFilteredVerified) {
+    if (urlFilteredVerified === "true") {
       galleryFilterStore.setFilterVerified(true);
-    } else {
+    } else if (urlFilteredVerified === "false") {
       galleryFilterStore.setFilterVerified(false);
+    } else {
+      galleryFilterStore.setFilterVerified(null);
     }
   }
   if (urlFilteredRa !== undefined) {
-    if (urlFilteredRa) {
+    if (urlFilteredRa === "true") {
       galleryFilterStore.setFilterRA(true);
-    } else {
+    } else if (urlFilteredRa === "false") {
       galleryFilterStore.setFilterRA(false);
+    } else {
+      galleryFilterStore.setFilterRA(null);
     }
   }
   // Check for query params to set multi-value filters (prioritize over single values)
diff --git a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
index afdc346f0..43a28cf87 100644
--- a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
+++ b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
@@ -33,15 +33,15 @@ const {
   filterRA,
   filterMissing,
   filterVerified,
-  selectedGenre,
-  selectedFranchise,
-  selectedCollection,
-  selectedCompany,
-  selectedAgeRating,
-  selectedStatus,
-  selectedPlatform,
-  selectedRegion,
-  selectedLanguage,
+  selectedGenres,
+  selectedFranchises,
+  selectedCollections,
+  selectedCompanies,
+  selectedAgeRatings,
+  selectedStatuses,
+  selectedPlatforms,
+  selectedRegions,
+  selectedLanguages,
 } = storeToRefs(galleryFilterStore);
 
 const emitter = inject<Emitter<Events>>("emitter");
@@ -63,8 +63,10 @@ const filterSummary = computed(() => {
   const filters = [];
 
   if (searchTerm.value) filters.push(`Search: "${searchTerm.value}"`);
-  if (selectedPlatform.value)
-    filters.push(`Platform: ${selectedPlatform.value.name}`);
+  if (selectedPlatforms.value && selectedPlatforms.value.length > 0)
+    filters.push(
+      `Platforms: ${selectedPlatforms.value.map((p) => p.name).join(", ")}`,
+    );
   if (filterMatched.value) filters.push("Matched only");
   if (filterFavorites.value) filters.push("Favorites");
   if (filterDuplicates.value) filters.push("Duplicates");
@@ -72,18 +74,22 @@ const filterSummary = computed(() => {
   if (filterRA.value) filters.push("Has RetroAchievements");
   if (filterMissing.value) filters.push("Missing from filesystem");
   if (filterVerified.value) filters.push("Verified");
-  if (selectedGenre.value) filters.push(`Genre: ${selectedGenre.value}`);
-  if (selectedFranchise.value)
-    filters.push(`Franchise: ${selectedFranchise.value}`);
-  if (selectedCollection.value)
-    filters.push(`Collection: ${selectedCollection.value}`);
-  if (selectedCompany.value) filters.push(`Company: ${selectedCompany.value}`);
-  if (selectedAgeRating.value)
-    filters.push(`Age Rating: ${selectedAgeRating.value}`);
-  if (selectedStatus.value) filters.push(`Status: ${selectedStatus.value}`);
-  if (selectedRegion.value) filters.push(`Region: ${selectedRegion.value}`);
-  if (selectedLanguage.value)
-    filters.push(`Language: ${selectedLanguage.value}`);
+  if (selectedGenres.value && selectedGenres.value.length > 0)
+    filters.push(`Genres: ${selectedGenres.value.join(", ")}`);
+  if (selectedFranchises.value && selectedFranchises.value.length > 0)
+    filters.push(`Franchises: ${selectedFranchises.value.join(", ")}`);
+  if (selectedCollections.value && selectedCollections.value.length > 0)
+    filters.push(`Collections: ${selectedCollections.value.join(", ")}`);
+  if (selectedCompanies.value && selectedCompanies.value.length > 0)
+    filters.push(`Companies: ${selectedCompanies.value.join(", ")}`);
+  if (selectedAgeRatings.value && selectedAgeRatings.value.length > 0)
+    filters.push(`Age Ratings: ${selectedAgeRatings.value.join(", ")}`);
+  if (selectedStatuses.value && selectedStatuses.value.length > 0)
+    filters.push(`Statuses: ${selectedStatuses.value.join(", ")}`);
+  if (selectedRegions.value && selectedRegions.value.length > 0)
+    filters.push(`Regions: ${selectedRegions.value.join(", ")}`);
+  if (selectedLanguages.value && selectedLanguages.value.length > 0)
+    filters.push(`Languages: ${selectedLanguages.value.join(", ")}`);
 
   return filters || ["No filters applied"];
 });
@@ -114,12 +120,12 @@ async function createSmartCollection() {
   try {
     const filterCriteria: Record<
       string,
-      number | boolean | string | string[] | null
+      number | boolean | string | string[] | number[] | (string | null)[] | null
     > = {};
 
     if (searchTerm.value) filterCriteria.search_term = searchTerm.value;
-    if (selectedPlatform.value)
-      filterCriteria.platform_id = selectedPlatform.value.id;
+    if (selectedPlatforms.value && selectedPlatforms.value.length > 0)
+      filterCriteria.platform_ids = selectedPlatforms.value.map((p) => p.id);
     if (filterMatched.value) filterCriteria.matched = true;
     if (filterFavorites.value) filterCriteria.favorite = true;
     if (filterDuplicates.value) filterCriteria.duplicate = true;
@@ -127,24 +133,29 @@ async function createSmartCollection() {
     if (filterRA.value) filterCriteria.has_ra = true;
     if (filterMissing.value) filterCriteria.missing = true;
     if (filterVerified.value) filterCriteria.verified = true;
-    if (selectedGenre.value && selectedGenre.value.length > 0)
-      filterCriteria.genres = selectedGenre.value;
-    if (selectedFranchise.value && selectedFranchise.value.length > 0)
-      filterCriteria.franchises = selectedFranchise.value;
-    if (selectedCollection.value && selectedCollection.value.length > 0)
-      filterCriteria.collections = selectedCollection.value;
-    if (selectedCompany.value && selectedCompany.value.length > 0)
-      filterCriteria.companies = selectedCompany.value;
-    if (selectedAgeRating.value && selectedAgeRating.value.length > 0)
-      filterCriteria.age_ratings = selectedAgeRating.value;
-    if (selectedStatus.value && selectedStatus.value.length > 0)
-      filterCriteria.selected_status = selectedStatus.value.map((s) =>
-        getStatusKeyForText(s),
-      );
-    if (selectedRegion.value && selectedRegion.value.length > 0)
-      filterCriteria.regions = selectedRegion.value;
-    if (selectedLanguage.value && selectedLanguage.value.length > 0)
-      filterCriteria.languages = selectedLanguage.value;
+    if (selectedGenres.value && selectedGenres.value.length > 0)
+      filterCriteria.genres = selectedGenres.value;
+    if (selectedFranchises.value && selectedFranchises.value.length > 0)
+      filterCriteria.franchises = selectedFranchises.value;
+    if (selectedCollections.value && selectedCollections.value.length > 0)
+      filterCriteria.collections = selectedCollections.value;
+    if (selectedCompanies.value && selectedCompanies.value.length > 0)
+      filterCriteria.companies = selectedCompanies.value;
+    if (selectedAgeRatings.value && selectedAgeRatings.value.length > 0)
+      filterCriteria.age_ratings = selectedAgeRatings.value;
+    if (selectedStatuses.value && selectedStatuses.value.length > 0) {
+      const statusKeys = selectedStatuses.value
+        .filter((s): s is string => s !== null)
+        .map((s) => getStatusKeyForText(s))
+        .filter((key) => key !== null);
+      if (statusKeys.length > 0) {
+        filterCriteria.selected_status = statusKeys;
+      }
+    }
+    if (selectedRegions.value && selectedRegions.value.length > 0)
+      filterCriteria.regions = selectedRegions.value;
+    if (selectedLanguages.value && selectedLanguages.value.length > 0)
+      filterCriteria.languages = selectedLanguages.value;
 
     const { data } = await collectionApi.createSmartCollection({
       smartCollection: {

From 904cbdde4bd1f982779a3feb04d865dd626b934b Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Mon, 1 Dec 2025 17:11:21 +0000
Subject: [PATCH 28/73] Refactor: update filter handling to correctly set
 matched and unmatched states based on URL parameters

---
 .../src/components/Gallery/AppBar/common/FilterDrawer/Base.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index ddb040b05..da8cd3221 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -442,7 +442,7 @@ onMounted(async () => {
     if (urlMatched === "true") {
       galleryFilterStore.setFilterMatched(true);
     } else if (urlMatched === "false") {
-      galleryFilterStore.setFilterUnmatched(true);
+      galleryFilterStore.setFilterMatched(false);
     }
     // Any other value means no filter (both remain null)
   }

From f1c7a5fb1db0e58faba38dd4edc5c79b57d07010 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Mon, 1 Dec 2025 17:12:37 +0000
Subject: [PATCH 29/73] Refactor: update icon for 'not-missing' state to use
 mdi-file-check

---
 .../Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
index 8fe22f69a..8eb38c264 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
@@ -78,7 +78,7 @@ function setState(state: string | null) {
       >
         <template #activator="{ props }">
           <v-btn value="not-missing" size="small" v-bind="props">
-            <v-icon size="x-large">mdi-folder-check</v-icon>
+            <v-icon size="x-large">mdi-file-check</v-icon>
           </v-btn>
         </template>
       </v-tooltip>

From ec4d157905acb16e5c27bfa8c8aeb9d373a52e8f Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 16 Dec 2025 23:16:36 +0000
Subject: [PATCH 30/73] Add user UI settings management and update related
 components

- Introduced `ui_settings` column in the users table via Alembic migration.
- Updated UserForm and UserSchema models to include `ui_settings`.
- Enhanced user update endpoint to handle `ui_settings`.
- Created a new composable `useUISettings` for managing UI settings with local storage.
- Refactored UI components to utilize the new `useUISettings` for theme and language settings.
---
 .../alembic/versions/0058_user_ui_settings.py |  37 ++++
 backend/endpoints/forms/identity.py           |   1 +
 backend/endpoints/responses/identity.py       |   1 +
 backend/endpoints/user.py                     |  15 ++
 backend/models/user.py                        |   3 +
 frontend/src/__generated__/models/UserForm.ts |   1 +
 .../src/__generated__/models/UserSchema.ts    |   1 +
 .../Settings/UserInterface/Interface.vue      |  74 +++-----
 .../UserInterface/LanguageSelector.vue        |   4 +-
 .../Settings/UserInterface/Theme.vue          |  21 +--
 frontend/src/composables/useUISettings.ts     | 171 ++++++++++++++++++
 frontend/src/plugins/vuetify.ts               |   2 +-
 frontend/src/services/api/user.ts             |   2 +
 13 files changed, 270 insertions(+), 63 deletions(-)
 create mode 100644 backend/alembic/versions/0058_user_ui_settings.py
 create mode 100644 frontend/src/composables/useUISettings.ts

diff --git a/backend/alembic/versions/0058_user_ui_settings.py b/backend/alembic/versions/0058_user_ui_settings.py
new file mode 100644
index 000000000..8ad41d97e
--- /dev/null
+++ b/backend/alembic/versions/0058_user_ui_settings.py
@@ -0,0 +1,37 @@
+"""user_ui_settings
+
+Revision ID: 0058_user_ui_settings
+Revises: 0057_multi_notes
+Create Date: 2025-12-16 21:02:52.394533
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "0058_user_ui_settings"
+down_revision = "0057_multi_notes"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Add ui_settings column to users table."""
+    with op.batch_alter_table("users", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "ui_settings",
+                sa.JSON().with_variant(
+                    postgresql.JSONB(astext_type=sa.Text()), "postgresql"
+                ),
+                nullable=True,
+            )
+        )
+
+
+def downgrade() -> None:
+    """Remove ui_settings column from users table."""
+    with op.batch_alter_table("users", schema=None) as batch_op:
+        batch_op.drop_column("ui_settings")
diff --git a/backend/endpoints/forms/identity.py b/backend/endpoints/forms/identity.py
index 312703a20..285d60bdb 100644
--- a/backend/endpoints/forms/identity.py
+++ b/backend/endpoints/forms/identity.py
@@ -11,6 +11,7 @@ class UserForm(BaseModel):
     enabled: bool | None = None
     ra_username: str | None = None
     avatar: UploadFile | None = None
+    ui_settings: str | None = None
 
 
 class OAuth2RequestForm:
diff --git a/backend/endpoints/responses/identity.py b/backend/endpoints/responses/identity.py
index cd96572a6..5ee5546ef 100644
--- a/backend/endpoints/responses/identity.py
+++ b/backend/endpoints/responses/identity.py
@@ -25,6 +25,7 @@ class UserSchema(BaseModel):
     last_active: datetime | None
     ra_username: str | None = None
     ra_progression: RAProgression | None = None
+    ui_settings: dict | None = None
 
     created_at: datetime
     updated_at: datetime
diff --git a/backend/endpoints/user.py b/backend/endpoints/user.py
index 6488fa92e..c8899c07c 100644
--- a/backend/endpoints/user.py
+++ b/backend/endpoints/user.py
@@ -1,3 +1,4 @@
+import json
 from typing import Annotated, Any, cast
 
 from fastapi import Body, Form, HTTPException
@@ -335,6 +336,20 @@ async def update_user(
     if form_data.ra_username:
         cleaned_data["ra_username"] = form_data.ra_username  # type: ignore[assignment]
 
+    if form_data.ui_settings is not None:
+        try:
+            ui_settings = json.loads(form_data.ui_settings)
+            if not isinstance(ui_settings, dict):
+                raise ValueError("ui_settings must be a JSON object")
+            cleaned_data["ui_settings"] = ui_settings  # type: ignore[assignment]
+        except (json.JSONDecodeError, ValueError) as exc:
+            msg = f"Invalid ui_settings JSON: {str(exc)}"
+            log.error(msg)
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=msg,
+            ) from exc
+
     if form_data.avatar is not None and form_data.avatar.filename is not None:
         user_avatar_path = fs_asset_handler.build_avatar_path(user=db_user)
         file_extension = form_data.avatar.filename.split(".")[-1]
diff --git a/backend/models/user.py b/backend/models/user.py
index 8e0f60a72..e980ec4d4 100644
--- a/backend/models/user.py
+++ b/backend/models/user.py
@@ -62,6 +62,9 @@ class User(BaseModel, SimpleUser):
     ra_progression: Mapped[dict[str, Any] | None] = mapped_column(
         CustomJSON(), default=dict
     )
+    ui_settings: Mapped[dict[str, Any] | None] = mapped_column(
+        CustomJSON(), default=dict
+    )
 
     saves: Mapped[list[Save]] = relationship(lazy="raise", back_populates="user")
     states: Mapped[list[State]] = relationship(lazy="raise", back_populates="user")
diff --git a/frontend/src/__generated__/models/UserForm.ts b/frontend/src/__generated__/models/UserForm.ts
index 2e5b2bd2d..14526d99c 100644
--- a/frontend/src/__generated__/models/UserForm.ts
+++ b/frontend/src/__generated__/models/UserForm.ts
@@ -10,5 +10,6 @@ export type UserForm = {
     enabled?: (boolean | null);
     ra_username?: (string | null);
     avatar?: (Blob | null);
+    ui_settings?: (string | null);
 };
 
diff --git a/frontend/src/__generated__/models/UserSchema.ts b/frontend/src/__generated__/models/UserSchema.ts
index f5c8b1fb2..4bd19e7d6 100644
--- a/frontend/src/__generated__/models/UserSchema.ts
+++ b/frontend/src/__generated__/models/UserSchema.ts
@@ -16,6 +16,7 @@ export type UserSchema = {
     last_active: (string | null);
     ra_username?: (string | null);
     ra_progression?: (RAProgression | null);
+    ui_settings?: (Record<string, any> | null);
     created_at: string;
     updated_at: string;
 };
diff --git a/frontend/src/components/Settings/UserInterface/Interface.vue b/frontend/src/components/Settings/UserInterface/Interface.vue
index 6b4437a90..ee56018fd 100644
--- a/frontend/src/components/Settings/UserInterface/Interface.vue
+++ b/frontend/src/components/Settings/UserInterface/Interface.vue
@@ -1,59 +1,38 @@
 <script setup lang="ts">
-import { useLocalStorage } from "@vueuse/core";
 import { computed } from "vue";
 import { useI18n } from "vue-i18n";
 import { useDisplay } from "vuetify";
 import InterfaceOption from "@/components/Settings/UserInterface/InterfaceOption.vue";
 import RSection from "@/components/common/RSection.vue";
+import { useUISettings } from "@/composables/useUISettings";
 import storeCollections from "@/stores/collections";
 
 const { t } = useI18n();
 const { smAndDown } = useDisplay();
 const collectionsStore = storeCollections();
 
-// Home
-const showStatsRef = useLocalStorage("settings.showStats", true);
-const showRecentRomsRef = useLocalStorage("settings.showRecentRoms", true);
-const showContinuePlayingRef = useLocalStorage(
-  "settings.showContinuePlaying",
-  true,
-);
-const showPlatformsRef = useLocalStorage("settings.showPlatforms", true);
-const showCollectionsRef = useLocalStorage("settings.showCollections", true);
-
-// Virtual collections
-const showVirtualCollectionsRef = useLocalStorage(
-  "settings.showVirtualCollections",
-  true,
-);
-const virtualCollectionTypeRef = useLocalStorage(
-  "settings.virtualCollectionType",
-  "collection",
-);
-
-// Platforms drawer
-const platformsGroupByRef = useLocalStorage<string | null>(
-  "settings.platformsGroupBy",
-  null,
-);
-
-// Gallery
-const groupRomsRef = useLocalStorage("settings.groupRoms", true);
-const siblingsRef = useLocalStorage("settings.showSiblings", true);
-const regionsRef = useLocalStorage("settings.showRegions", true);
-const languagesRef = useLocalStorage("settings.showLanguages", true);
-const statusRef = useLocalStorage("settings.showStatus", true);
-const actionBarRef = useLocalStorage("settings.showActionBar", false);
-const gameTitleRef = useLocalStorage("settings.showGameTitle", false);
-const enable3DEffectRef = useLocalStorage("settings.enable3DEffect", false);
-const enableExperimentalCacheRef = useLocalStorage(
-  "settings.enableExperimentalCache",
-  false,
-);
-const disableAnimationsRef = useLocalStorage(
-  "settings.disableAnimations",
-  false,
-);
+// Get UI settings from the composable
+const {
+  showStats: showStatsRef,
+  showRecentRoms: showRecentRomsRef,
+  showContinuePlaying: showContinuePlayingRef,
+  showPlatforms: showPlatformsRef,
+  showCollections: showCollectionsRef,
+  showVirtualCollections: showVirtualCollectionsRef,
+  virtualCollectionType: virtualCollectionTypeRef,
+  platformsGroupBy: platformsGroupByRef,
+  groupRoms: groupRomsRef,
+  showSiblings: siblingsRef,
+  showRegions: regionsRef,
+  showLanguages: languagesRef,
+  showStatus: statusRef,
+  showActionBar: actionBarRef,
+  showGameTitle: gameTitleRef,
+  enable3DEffect: enable3DEffectRef,
+  enableExperimentalCache: enableExperimentalCacheRef,
+  disableAnimations: disableAnimationsRef,
+  boxartStyle: boxartStyleRef,
+} = useUISettings();
 
 // Boxart
 export type BoxartStyleOption =
@@ -61,10 +40,6 @@ export type BoxartStyleOption =
   | "box3d_path"
   | "physical_path"
   | "miximage_path";
-const boxartStyleRef = useLocalStorage<BoxartStyleOption>(
-  "settings.boxartStyle",
-  "cover_path",
-);
 
 const homeOptions = computed(() => [
   {
@@ -314,7 +289,8 @@ const toggleDisableAnimations = (value: boolean) => {
         <v-col
           v-for="option in platformsDrawerOptions"
           :key="option.title"
-          cols="6"
+          cols="12"
+          md="6"
         >
           <v-select
             v-model="platformsGroupByRef"
diff --git a/frontend/src/components/Settings/UserInterface/LanguageSelector.vue b/frontend/src/components/Settings/UserInterface/LanguageSelector.vue
index 373389ad5..58f511301 100644
--- a/frontend/src/components/Settings/UserInterface/LanguageSelector.vue
+++ b/frontend/src/components/Settings/UserInterface/LanguageSelector.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
-import { useLocalStorage } from "@vueuse/core";
 import { storeToRefs } from "pinia";
 import { useI18n } from "vue-i18n";
+import { useUISettings } from "@/composables/useUISettings";
 import storeLanguage from "@/stores/language";
 
 const { locale } = useI18n();
 const languageStore = storeLanguage();
 const { languages, selectedLanguage } = storeToRefs(languageStore);
 
-const localeStorage = useLocalStorage("settings.locale", "");
+const { locale: localeStorage } = useUISettings();
 
 function changeLanguage() {
   locale.value = selectedLanguage.value.value;
diff --git a/frontend/src/components/Settings/UserInterface/Theme.vue b/frontend/src/components/Settings/UserInterface/Theme.vue
index 614e54e53..a4a8d82b8 100644
--- a/frontend/src/components/Settings/UserInterface/Theme.vue
+++ b/frontend/src/components/Settings/UserInterface/Theme.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-import { useLocalStorage } from "@vueuse/core";
-import { computed } from "vue";
+import { computed, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useTheme } from "vuetify";
 import ThemeOption from "@/components/Settings/UserInterface/ThemeOption.vue";
 import RSection from "@/components/common/RSection.vue";
+import { useUISettings } from "@/composables/useUISettings";
 import { autoThemeKey, themes } from "@/styles/themes";
 import { isKeyof } from "@/types";
 
 const { t } = useI18n();
 const theme = useTheme();
-const selectedTheme = useLocalStorage("settings.theme", autoThemeKey);
+const { theme: selectedTheme } = useUISettings();
 const themeOptions = computed(() => [
   {
     name: "dark",
@@ -26,23 +26,22 @@ const themeOptions = computed(() => [
   },
 ]);
 
-function toggleTheme() {
+function applyTheme() {
   const mediaMatch = window.matchMedia("(prefers-color-scheme: dark)");
   if (selectedTheme.value === autoThemeKey) {
-    theme.global.name.value = mediaMatch.matches ? "dark" : "light";
+    theme.change(mediaMatch.matches ? "dark" : "light");
   } else if (isKeyof(selectedTheme.value, themes)) {
-    theme.global.name.value = themes[selectedTheme.value];
+    theme.change(themes[selectedTheme.value]);
   }
 }
+
+// Apply theme when it changes (including from backend sync)
+watch(selectedTheme, applyTheme, { immediate: true });
 </script>
 <template>
   <RSection icon="mdi-brush-variant" :title="t('settings.theme')" class="ma-2">
     <template #content>
-      <v-item-group
-        v-model="selectedTheme"
-        mandatory
-        @update:model-value="toggleTheme"
-      >
+      <v-item-group v-model="selectedTheme" mandatory>
         <v-row no-gutters>
           <v-col
             v-for="themeOption in themeOptions"
diff --git a/frontend/src/composables/useUISettings.ts b/frontend/src/composables/useUISettings.ts
new file mode 100644
index 000000000..40ee3a845
--- /dev/null
+++ b/frontend/src/composables/useUISettings.ts
@@ -0,0 +1,171 @@
+import { useLocalStorage } from "@vueuse/core";
+import { storeToRefs } from "pinia";
+import { computed, watch, ref } from "vue";
+import type { UserSchema } from "@/__generated__";
+import userApi from "@/services/api/user";
+import storeAuth from "@/stores/auth";
+
+// Debounce utility
+function debounce<T extends (...args: any[]) => any>(
+  func: T,
+  wait: number,
+): (...args: Parameters<T>) => void {
+  let timeout: ReturnType<typeof setTimeout> | null = null;
+  return (...args: Parameters<T>) => {
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(() => func(...args), wait);
+  };
+}
+
+// UI Settings keys and their default values
+export const UI_SETTINGS_KEYS = {
+  // Home section
+  showStats: { key: "settings.showStats", default: true },
+  showRecentRoms: { key: "settings.showRecentRoms", default: true },
+  showContinuePlaying: { key: "settings.showContinuePlaying", default: true },
+  showPlatforms: { key: "settings.showPlatforms", default: true },
+  showCollections: { key: "settings.showCollections", default: true },
+
+  // Virtual collections
+  showVirtualCollections: {
+    key: "settings.showVirtualCollections",
+    default: true,
+  },
+  virtualCollectionType: {
+    key: "settings.virtualCollectionType",
+    default: "collection",
+  },
+
+  // Platforms drawer
+  platformsGroupBy: { key: "settings.platformsGroupBy", default: null },
+
+  // Gallery section
+  groupRoms: { key: "settings.groupRoms", default: true },
+  showSiblings: { key: "settings.showSiblings", default: true },
+  showRegions: { key: "settings.showRegions", default: true },
+  showLanguages: { key: "settings.showLanguages", default: true },
+  showStatus: { key: "settings.showStatus", default: true },
+  showActionBar: { key: "settings.showActionBar", default: false },
+  showGameTitle: { key: "settings.showGameTitle", default: false },
+  enable3DEffect: { key: "settings.enable3DEffect", default: false },
+  disableAnimations: { key: "settings.disableAnimations", default: false },
+  enableExperimentalCache: {
+    key: "settings.enableExperimentalCache",
+    default: false,
+  },
+  boxartStyle: { key: "settings.boxartStyle", default: "cover_path" },
+
+  // Theme
+  theme: { key: "settings.theme", default: "auto" },
+
+  // Language
+  locale: { key: "settings.locale", default: "" },
+} as const;
+
+export type UISettingsKey = keyof typeof UI_SETTINGS_KEYS;
+
+// Singleton state to prevent multiple instances
+let uiSettingsInstance: ReturnType<typeof createUISettings> | null = null;
+let isSyncing = ref(false); // Global flag to prevent sync loops
+
+function createUISettings() {
+  const authStore = storeAuth();
+  const { user } = storeToRefs(authStore);
+
+  // Get all localStorage refs
+  const localStorageRefs = Object.fromEntries(
+    Object.entries(UI_SETTINGS_KEYS).map(([name, config]) => [
+      name,
+      useLocalStorage(config.key, config.default),
+    ]),
+  ) as Record<UISettingsKey, ReturnType<typeof useLocalStorage>>;
+
+  // Initialize settings from backend user data
+  function initializeFromBackend() {
+    const userWithSettings = user.value as UserSchema | null;
+    if (!userWithSettings?.ui_settings) return;
+
+    isSyncing.value = true;
+    const backendSettings = userWithSettings.ui_settings;
+
+    // Sync backend settings to localStorage
+    Object.entries(localStorageRefs).forEach(([key, ref]) => {
+      if (key in backendSettings) {
+        ref.value = backendSettings[key as UISettingsKey];
+      }
+    });
+
+    // Use nextTick-like delay to ensure all updates are done
+    setTimeout(() => {
+      isSyncing.value = false;
+    }, 50);
+  }
+
+  // Collect current settings from localStorage
+  function collectSettings(): Record<string, any> {
+    return Object.fromEntries(
+      Object.entries(localStorageRefs).map(([key, ref]) => [key, ref.value]),
+    );
+  }
+
+  // Debounced function to save settings to backend
+  const saveToBackend = debounce(async () => {
+    if (!user.value || isSyncing.value) return;
+
+    const currentSettings = collectSettings();
+
+    try {
+      const { data } = await userApi.updateUser({
+        id: user.value.id,
+        ui_settings: JSON.stringify(currentSettings),
+      } as any);
+
+      // Update the user in the store with the new settings (without triggering sync)
+      isSyncing.value = true;
+      const dataWithSettings = data as UserSchema;
+      if (dataWithSettings.ui_settings) {
+        authStore.setCurrentUser(data);
+      }
+      setTimeout(() => {
+        isSyncing.value = false;
+      }, 50);
+    } catch (error) {
+      console.error("Failed to save UI settings to backend:", error);
+    }
+  }, 500);
+
+  // Watch all localStorage refs for changes (only set up once)
+  Object.values(localStorageRefs).forEach((ref) => {
+    watch(ref, () => {
+      if (!isSyncing.value) {
+        saveToBackend();
+      }
+    });
+  });
+
+  // Watch user changes to initialize settings
+  watch(
+    user,
+    (newUser) => {
+      const userWithSettings = newUser as UserSchema | null;
+      if (userWithSettings?.ui_settings) {
+        initializeFromBackend();
+      }
+    },
+    { immediate: true },
+  );
+
+  return {
+    ...localStorageRefs,
+    initializeFromBackend,
+    saveToBackend: () => saveToBackend(),
+  };
+}
+
+export function useUISettings() {
+  // Return singleton instance
+  if (!uiSettingsInstance) {
+    uiSettingsInstance = createUISettings();
+  }
+  return uiSettingsInstance;
+}
diff --git a/frontend/src/plugins/vuetify.ts b/frontend/src/plugins/vuetify.ts
index 09291455f..edf550d57 100644
--- a/frontend/src/plugins/vuetify.ts
+++ b/frontend/src/plugins/vuetify.ts
@@ -7,7 +7,7 @@ import { isKeyof } from "@/types";
 
 const mediaMatch = window.matchMedia("(prefers-color-scheme: dark)");
 mediaMatch.addEventListener("change", (event) => {
-  instance.theme.global.name.value = event.matches ? "dark" : "light";
+  instance.theme.change(event.matches ? "dark" : "light");
 });
 
 function getTheme() {
diff --git a/frontend/src/services/api/user.ts b/frontend/src/services/api/user.ts
index e2ec65497..b23e47430 100644
--- a/frontend/src/services/api/user.ts
+++ b/frontend/src/services/api/user.ts
@@ -54,6 +54,7 @@ async function updateUser({
 }: Partial<UserSchema> & {
   avatar?: File;
   password?: string;
+  ui_settings?: string;
 }): Promise<{ data: UserSchema }> {
   return api.put(
     `/users/${id}`,
@@ -65,6 +66,7 @@ async function updateUser({
       enabled: attrs.enabled,
       role: attrs.role,
       ra_username: attrs.ra_username,
+      ui_settings: attrs.ui_settings,
     },
     {
       headers: {

From 6676073395dbb6c5730030c1d85cc7d207db5b2d Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 16 Dec 2025 23:25:15 +0000
Subject: [PATCH 31/73] fix: typecheck

---
 .../Administration/Users/UsersTable.vue       | 10 +++++++++-
 .../Settings/UserInterface/Interface.vue      | 20 +++++++++----------
 .../Settings/UserInterface/Theme.vue          |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Settings/Administration/Users/UsersTable.vue b/frontend/src/components/Settings/Administration/Users/UsersTable.vue
index 295c2eb7a..f40770c7a 100644
--- a/frontend/src/components/Settings/Administration/Users/UsersTable.vue
+++ b/frontend/src/components/Settings/Administration/Users/UsersTable.vue
@@ -3,6 +3,7 @@ import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
 import { inject, onMounted, ref } from "vue";
 import { useI18n } from "vue-i18n";
+import type { UserSchema } from "@/__generated__";
 import CreateUserDialog from "@/components/Settings/Administration/Users/Dialog/CreateUser.vue";
 import DeleteUserDialog from "@/components/Settings/Administration/Users/Dialog/DeleteUser.vue";
 import InviteLinkDialog from "@/components/Settings/Administration/Users/Dialog/InviteLink.vue";
@@ -61,7 +62,14 @@ const HEADERS = [
 ] as const;
 
 function disableUser(user: User) {
-  userApi.updateUser(user).catch(({ response, message }) => {
+  const userUpdate = {
+    ...user,
+    ui_settings: user.ui_settings
+      ? JSON.stringify(user.ui_settings)
+      : undefined,
+  } as Partial<UserSchema> & { ui_settings?: string };
+
+  userApi.updateUser(userUpdate).catch(({ response, message }) => {
     emitter?.emit("snackbarShow", {
       msg: `Unable to disable/enable user: ${
         response?.data?.detail || response?.statusText || message
diff --git a/frontend/src/components/Settings/UserInterface/Interface.vue b/frontend/src/components/Settings/UserInterface/Interface.vue
index ee56018fd..4aeb951d4 100644
--- a/frontend/src/components/Settings/UserInterface/Interface.vue
+++ b/frontend/src/components/Settings/UserInterface/Interface.vue
@@ -186,8 +186,8 @@ const boxartStyleOptions = computed(() => [
   { title: t("settings.boxart-miximage"), value: "miximage_path" },
 ]);
 
-const setPlatformDrawerGroupBy = (value: string) => {
-  platformsGroupByRef.value = value;
+const setPlatformDrawerGroupBy = (value: unknown) => {
+  platformsGroupByRef.value = value as string;
 };
 const toggleShowContinuePlaying = (value: boolean) => {
   showContinuePlayingRef.value = value;
@@ -201,12 +201,12 @@ const toggleShowCollections = (value: boolean) => {
 const toggleShowVirtualCollections = (value: boolean) => {
   showVirtualCollectionsRef.value = value;
 };
-const setVirtualCollectionType = async (value: string) => {
-  virtualCollectionTypeRef.value = value;
-  collectionsStore.fetchVirtualCollections(value);
+const setVirtualCollectionType = async (value: unknown) => {
+  virtualCollectionTypeRef.value = value as string;
+  collectionsStore.fetchVirtualCollections(value as string);
 };
-const setBoxartStyle = (value: BoxartStyleOption) => {
-  boxartStyleRef.value = value;
+const setBoxartStyle = (value: unknown) => {
+  boxartStyleRef.value = value as BoxartStyleOption;
 };
 const toggleShowStats = (value: boolean) => {
   showStatsRef.value = value;
@@ -265,7 +265,7 @@ const toggleDisableAnimations = (value: boolean) => {
           md="6"
         >
           <InterfaceOption
-            v-model="option.model.value"
+            v-model="option.model.value as boolean"
             class="ma-1"
             :title="option.title"
             :description="option.description"
@@ -325,7 +325,7 @@ const toggleDisableAnimations = (value: boolean) => {
           md="6"
         >
           <InterfaceOption
-            v-model="option.model.value"
+            v-model="option.model.value as boolean"
             class="ma-1"
             :disabled="option.disabled"
             :title="option.title"
@@ -360,7 +360,7 @@ const toggleDisableAnimations = (value: boolean) => {
       <v-row class="py-1 align-center" no-gutters>
         <v-col cols="12" md="6">
           <InterfaceOption
-            v-model="showVirtualCollectionsRef"
+            v-model="showVirtualCollectionsRef as boolean"
             class="mx-2"
             :title="t('settings.show-virtual-collections')"
             :description="t('settings.show-virtual-collections-desc')"
diff --git a/frontend/src/components/Settings/UserInterface/Theme.vue b/frontend/src/components/Settings/UserInterface/Theme.vue
index a4a8d82b8..2ae7fb084 100644
--- a/frontend/src/components/Settings/UserInterface/Theme.vue
+++ b/frontend/src/components/Settings/UserInterface/Theme.vue
@@ -30,8 +30,8 @@ function applyTheme() {
   const mediaMatch = window.matchMedia("(prefers-color-scheme: dark)");
   if (selectedTheme.value === autoThemeKey) {
     theme.change(mediaMatch.matches ? "dark" : "light");
-  } else if (isKeyof(selectedTheme.value, themes)) {
-    theme.change(themes[selectedTheme.value]);
+  } else if (isKeyof(selectedTheme.value as PropertyKey, themes)) {
+    theme.change(themes[selectedTheme.value as keyof typeof themes]);
   }
 }
 

From 685eb01f10ae60c42e3bf4a01f44135d5ce3152a Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 16 Dec 2025 23:34:22 +0000
Subject: [PATCH 32/73] chore: update linter versions in trunk.yaml

---
 .trunk/trunk.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index cae18c038..4a1dfff2d 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -24,21 +24,21 @@ lint:
   enabled:
     - dotenv-linter@4.0.0
     - hadolint@2.14.0
-    - markdownlint@0.46.0
-    - eslint@9.39.1
+    - markdownlint@0.47.0
+    - eslint@9.39.2
     - actionlint@1.7.9
     - bandit@1.9.2
     - black@25.12.0
     - checkov@3.2.495
     - git-diff-check
     - isort@7.0.0
-    - mypy@1.19.0
-    - osv-scanner@2.3.0
+    - mypy@1.19.1
+    - osv-scanner@2.3.1
     - prettier@3.7.4:
         packages:
           - "@trivago/prettier-plugin-sort-imports@6.0.0"
           - "@vue/compiler-sfc@3.5.25"
-    - ruff@0.14.8
+    - ruff@0.14.9
     - shellcheck@0.11.0
     - shfmt@3.6.0
     - taplo@0.10.0

From 3f9e55f0bbdc20be31df16537cb04a615b53ea3f Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 16 Dec 2025 23:54:32 +0000
Subject: [PATCH 33/73] refactor: improve type safety in UI settings and theme
 components

---
 .../Settings/UserInterface/Interface.vue      | 18 ++--
 .../Settings/UserInterface/Theme.vue          | 10 +--
 frontend/src/composables/useUISettings.ts     | 84 ++++++++++---------
 3 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/frontend/src/components/Settings/UserInterface/Interface.vue b/frontend/src/components/Settings/UserInterface/Interface.vue
index 4aeb951d4..4b0bf6b1d 100644
--- a/frontend/src/components/Settings/UserInterface/Interface.vue
+++ b/frontend/src/components/Settings/UserInterface/Interface.vue
@@ -186,8 +186,8 @@ const boxartStyleOptions = computed(() => [
   { title: t("settings.boxart-miximage"), value: "miximage_path" },
 ]);
 
-const setPlatformDrawerGroupBy = (value: unknown) => {
-  platformsGroupByRef.value = value as string;
+const setPlatformDrawerGroupBy = (value: string | null) => {
+  platformsGroupByRef.value = value;
 };
 const toggleShowContinuePlaying = (value: boolean) => {
   showContinuePlayingRef.value = value;
@@ -201,11 +201,11 @@ const toggleShowCollections = (value: boolean) => {
 const toggleShowVirtualCollections = (value: boolean) => {
   showVirtualCollectionsRef.value = value;
 };
-const setVirtualCollectionType = async (value: unknown) => {
-  virtualCollectionTypeRef.value = value as string;
-  collectionsStore.fetchVirtualCollections(value as string);
+const setVirtualCollectionType = async (value: string) => {
+  virtualCollectionTypeRef.value = value;
+  collectionsStore.fetchVirtualCollections(value);
 };
-const setBoxartStyle = (value: unknown) => {
+const setBoxartStyle = (value: string) => {
   boxartStyleRef.value = value as BoxartStyleOption;
 };
 const toggleShowStats = (value: boolean) => {
@@ -265,7 +265,7 @@ const toggleDisableAnimations = (value: boolean) => {
           md="6"
         >
           <InterfaceOption
-            v-model="option.model.value as boolean"
+            v-model="option.model.value"
             class="ma-1"
             :title="option.title"
             :description="option.description"
@@ -325,7 +325,7 @@ const toggleDisableAnimations = (value: boolean) => {
           md="6"
         >
           <InterfaceOption
-            v-model="option.model.value as boolean"
+            v-model="option.model.value"
             class="ma-1"
             :disabled="option.disabled"
             :title="option.title"
@@ -360,7 +360,7 @@ const toggleDisableAnimations = (value: boolean) => {
       <v-row class="py-1 align-center" no-gutters>
         <v-col cols="12" md="6">
           <InterfaceOption
-            v-model="showVirtualCollectionsRef as boolean"
+            v-model="showVirtualCollectionsRef"
             class="mx-2"
             :title="t('settings.show-virtual-collections')"
             :description="t('settings.show-virtual-collections-desc')"
diff --git a/frontend/src/components/Settings/UserInterface/Theme.vue b/frontend/src/components/Settings/UserInterface/Theme.vue
index 2ae7fb084..1c4c265cd 100644
--- a/frontend/src/components/Settings/UserInterface/Theme.vue
+++ b/frontend/src/components/Settings/UserInterface/Theme.vue
@@ -5,8 +5,6 @@ import { useTheme } from "vuetify";
 import ThemeOption from "@/components/Settings/UserInterface/ThemeOption.vue";
 import RSection from "@/components/common/RSection.vue";
 import { useUISettings } from "@/composables/useUISettings";
-import { autoThemeKey, themes } from "@/styles/themes";
-import { isKeyof } from "@/types";
 
 const { t } = useI18n();
 const theme = useTheme();
@@ -28,10 +26,12 @@ const themeOptions = computed(() => [
 
 function applyTheme() {
   const mediaMatch = window.matchMedia("(prefers-color-scheme: dark)");
-  if (selectedTheme.value === autoThemeKey) {
+  const themeValue = selectedTheme.value;
+
+  if (themeValue === "auto") {
     theme.change(mediaMatch.matches ? "dark" : "light");
-  } else if (isKeyof(selectedTheme.value as PropertyKey, themes)) {
-    theme.change(themes[selectedTheme.value as keyof typeof themes]);
+  } else if (themeValue === "dark" || themeValue === "light") {
+    theme.change(themeValue);
   }
 }
 
diff --git a/frontend/src/composables/useUISettings.ts b/frontend/src/composables/useUISettings.ts
index 40ee3a845..280782518 100644
--- a/frontend/src/composables/useUISettings.ts
+++ b/frontend/src/composables/useUISettings.ts
@@ -1,24 +1,18 @@
 import { useLocalStorage } from "@vueuse/core";
+import type { RemovableRef } from "@vueuse/core";
 import { storeToRefs } from "pinia";
-import { computed, watch, ref } from "vue";
+import { watch, ref } from "vue";
 import type { UserSchema } from "@/__generated__";
 import userApi from "@/services/api/user";
 import storeAuth from "@/stores/auth";
 
-// Debounce utility
-function debounce<T extends (...args: any[]) => any>(
-  func: T,
-  wait: number,
-): (...args: Parameters<T>) => void {
-  let timeout: ReturnType<typeof setTimeout> | null = null;
-  return (...args: Parameters<T>) => {
-    if (timeout) clearTimeout(timeout);
-    timeout = setTimeout(() => func(...args), wait);
-  };
-}
-
-// UI Settings keys and their default values
 export const UI_SETTINGS_KEYS = {
+  // Language
+  locale: { key: "settings.locale", default: "" },
+
+  // Theme
+  theme: { key: "settings.theme", default: "auto" },
+
   // Home section
   showStats: { key: "settings.showStats", default: true },
   showRecentRoms: { key: "settings.showRecentRoms", default: true },
@@ -26,16 +20,6 @@ export const UI_SETTINGS_KEYS = {
   showPlatforms: { key: "settings.showPlatforms", default: true },
   showCollections: { key: "settings.showCollections", default: true },
 
-  // Virtual collections
-  showVirtualCollections: {
-    key: "settings.showVirtualCollections",
-    default: true,
-  },
-  virtualCollectionType: {
-    key: "settings.virtualCollectionType",
-    default: "collection",
-  },
-
   // Platforms drawer
   platformsGroupBy: { key: "settings.platformsGroupBy", default: null },
 
@@ -55,15 +39,40 @@ export const UI_SETTINGS_KEYS = {
   },
   boxartStyle: { key: "settings.boxartStyle", default: "cover_path" },
 
-  // Theme
-  theme: { key: "settings.theme", default: "auto" },
-
-  // Language
-  locale: { key: "settings.locale", default: "" },
+  // Virtual collections
+  showVirtualCollections: {
+    key: "settings.showVirtualCollections",
+    default: true,
+  },
+  virtualCollectionType: {
+    key: "settings.virtualCollectionType",
+    default: "collection",
+  },
 } as const;
 
 export type UISettingsKey = keyof typeof UI_SETTINGS_KEYS;
 
+// Helper type to extract the default value type for each setting
+// Widens literal types to their base types (e.g., true -> boolean, "auto" -> string)
+type WidenLiteral<T> = T extends string
+  ? string
+  : T extends number
+    ? number
+    : T extends boolean
+      ? boolean
+      : T extends null
+        ? string | null
+        : T;
+
+type UISettingDefaultType<K extends UISettingsKey> = WidenLiteral<
+  (typeof UI_SETTINGS_KEYS)[K]["default"]
+>;
+
+// Strongly-typed refs for each UI setting
+type UISettingsRefs = {
+  [K in UISettingsKey]: RemovableRef<UISettingDefaultType<K>>;
+};
+
 // Singleton state to prevent multiple instances
 let uiSettingsInstance: ReturnType<typeof createUISettings> | null = null;
 let isSyncing = ref(false); // Global flag to prevent sync loops
@@ -78,10 +87,10 @@ function createUISettings() {
       name,
       useLocalStorage(config.key, config.default),
     ]),
-  ) as Record<UISettingsKey, ReturnType<typeof useLocalStorage>>;
+  ) as UISettingsRefs;
 
   // Initialize settings from backend user data
-  function initializeFromBackend() {
+  function initialize() {
     const userWithSettings = user.value as UserSchema | null;
     if (!userWithSettings?.ui_settings) return;
 
@@ -108,8 +117,7 @@ function createUISettings() {
     );
   }
 
-  // Debounced function to save settings to backend
-  const saveToBackend = debounce(async () => {
+  const saveUISettings = async () => {
     if (!user.value || isSyncing.value) return;
 
     const currentSettings = collectSettings();
@@ -132,13 +140,13 @@ function createUISettings() {
     } catch (error) {
       console.error("Failed to save UI settings to backend:", error);
     }
-  }, 500);
+  };
 
   // Watch all localStorage refs for changes (only set up once)
   Object.values(localStorageRefs).forEach((ref) => {
     watch(ref, () => {
       if (!isSyncing.value) {
-        saveToBackend();
+        saveUISettings();
       }
     });
   });
@@ -149,7 +157,7 @@ function createUISettings() {
     (newUser) => {
       const userWithSettings = newUser as UserSchema | null;
       if (userWithSettings?.ui_settings) {
-        initializeFromBackend();
+        initialize();
       }
     },
     { immediate: true },
@@ -157,8 +165,8 @@ function createUISettings() {
 
   return {
     ...localStorageRefs,
-    initializeFromBackend,
-    saveToBackend: () => saveToBackend(),
+    initialize: initialize,
+    saveUISettings: () => saveUISettings(),
   };
 }
 

From acf6452cad2a3090f144585155c81603c404f1a6 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 17 Dec 2025 00:00:58 +0000
Subject: [PATCH 34/73] fix: trunk

---
 frontend/src/composables/useUISettings.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/composables/useUISettings.ts b/frontend/src/composables/useUISettings.ts
index 280782518..e8150b6cb 100644
--- a/frontend/src/composables/useUISettings.ts
+++ b/frontend/src/composables/useUISettings.ts
@@ -75,7 +75,7 @@ type UISettingsRefs = {
 
 // Singleton state to prevent multiple instances
 let uiSettingsInstance: ReturnType<typeof createUISettings> | null = null;
-let isSyncing = ref(false); // Global flag to prevent sync loops
+const isSyncing = ref(false); // Global flag to prevent sync loops
 
 function createUISettings() {
   const authStore = storeAuth();
@@ -111,7 +111,7 @@ function createUISettings() {
   }
 
   // Collect current settings from localStorage
-  function collectSettings(): Record<string, any> {
+  function collectSettings(): Record<string, unknown> {
     return Object.fromEntries(
       Object.entries(localStorageRefs).map(([key, ref]) => [key, ref.value]),
     );
@@ -126,7 +126,7 @@ function createUISettings() {
       const { data } = await userApi.updateUser({
         id: user.value.id,
         ui_settings: JSON.stringify(currentSettings),
-      } as any);
+      } as Partial<UserSchema> & { ui_settings: string });
 
       // Update the user in the store with the new settings (without triggering sync)
       isSyncing.value = true;

From 02292ee22347b80be407f689e652f4da229ceb86 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 17 Dec 2025 00:11:53 +0000
Subject: [PATCH 35/73] refactor: simplify user update logic by removing
 unnecessary ui_settings handling

---
 .../Settings/Administration/Users/UsersTable.vue       | 10 +---------
 frontend/src/services/api/user.ts                      |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/frontend/src/components/Settings/Administration/Users/UsersTable.vue b/frontend/src/components/Settings/Administration/Users/UsersTable.vue
index f40770c7a..295c2eb7a 100644
--- a/frontend/src/components/Settings/Administration/Users/UsersTable.vue
+++ b/frontend/src/components/Settings/Administration/Users/UsersTable.vue
@@ -3,7 +3,6 @@ import type { Emitter } from "mitt";
 import { storeToRefs } from "pinia";
 import { inject, onMounted, ref } from "vue";
 import { useI18n } from "vue-i18n";
-import type { UserSchema } from "@/__generated__";
 import CreateUserDialog from "@/components/Settings/Administration/Users/Dialog/CreateUser.vue";
 import DeleteUserDialog from "@/components/Settings/Administration/Users/Dialog/DeleteUser.vue";
 import InviteLinkDialog from "@/components/Settings/Administration/Users/Dialog/InviteLink.vue";
@@ -62,14 +61,7 @@ const HEADERS = [
 ] as const;
 
 function disableUser(user: User) {
-  const userUpdate = {
-    ...user,
-    ui_settings: user.ui_settings
-      ? JSON.stringify(user.ui_settings)
-      : undefined,
-  } as Partial<UserSchema> & { ui_settings?: string };
-
-  userApi.updateUser(userUpdate).catch(({ response, message }) => {
+  userApi.updateUser(user).catch(({ response, message }) => {
     emitter?.emit("snackbarShow", {
       msg: `Unable to disable/enable user: ${
         response?.data?.detail || response?.statusText || message
diff --git a/frontend/src/services/api/user.ts b/frontend/src/services/api/user.ts
index b23e47430..b61687117 100644
--- a/frontend/src/services/api/user.ts
+++ b/frontend/src/services/api/user.ts
@@ -54,7 +54,6 @@ async function updateUser({
 }: Partial<UserSchema> & {
   avatar?: File;
   password?: string;
-  ui_settings?: string;
 }): Promise<{ data: UserSchema }> {
   return api.put(
     `/users/${id}`,

From 5bf757f8607a3f44aa6771a42a4d0b821d2912cf Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 17 Dec 2025 00:15:20 +0000
Subject: [PATCH 36/73] fix: improve error handling for invalid ui_settings
 JSON

---
 backend/endpoints/user.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/endpoints/user.py b/backend/endpoints/user.py
index c8899c07c..48d31151f 100644
--- a/backend/endpoints/user.py
+++ b/backend/endpoints/user.py
@@ -340,7 +340,12 @@ async def update_user(
         try:
             ui_settings = json.loads(form_data.ui_settings)
             if not isinstance(ui_settings, dict):
-                raise ValueError("ui_settings must be a JSON object")
+                msg = f"Invalid ui_settings JSON: {ui_settings}"
+                log.error(msg)
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail=msg,
+                )
             cleaned_data["ui_settings"] = ui_settings  # type: ignore[assignment]
         except (json.JSONDecodeError, ValueError) as exc:
             msg = f"Invalid ui_settings JSON: {str(exc)}"

From a147b61a7688815ff134dd2e6d3b9d6de00c8144 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 17 Dec 2025 00:23:54 +0000
Subject: [PATCH 37/73] test: add comprehensive tests for user UI settings
 updates

---
 backend/tests/endpoints/test_identity.py | 106 +++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/backend/tests/endpoints/test_identity.py b/backend/tests/endpoints/test_identity.py
index 39afbc424..5c1beed74 100644
--- a/backend/tests/endpoints/test_identity.py
+++ b/backend/tests/endpoints/test_identity.py
@@ -1,4 +1,5 @@
 import base64
+import json
 from datetime import timedelta
 from http import HTTPStatus
 from unittest import mock
@@ -247,3 +248,108 @@ async def test_logout_invalidates_session(client, admin_user: User):
     assert response.status_code in [HTTPStatus.UNAUTHORIZED, HTTPStatus.FORBIDDEN]
 
     await RedisSessionMiddleware.clear_user_sessions(admin_user.username)
+
+
+def test_update_user_with_valid_ui_settings(
+    client, access_token: str, editor_user: User
+):
+    """Test updating a user with valid ui_settings JSON object."""
+    valid_ui_settings = {
+        "theme": "dark",
+        "language": "en",
+        "notifications_enabled": True,
+        "items_per_page": 50,
+    }
+
+    response = client.put(
+        f"/api/users/{editor_user.id}",
+        data={"ui_settings": json.dumps(valid_ui_settings)},
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == HTTPStatus.OK
+
+    user = response.json()
+    assert user["ui_settings"] == valid_ui_settings
+
+    # Verify settings are properly stored by retrieving the user again
+    response = client.get(
+        f"/api/users/{editor_user.id}",
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == HTTPStatus.OK
+    user = response.json()
+    assert user["ui_settings"] == valid_ui_settings
+
+
+def test_update_user_with_invalid_ui_settings_json(
+    client, access_token: str, editor_user: User
+):
+    """Test that updating ui_settings with invalid JSON returns 400."""
+    invalid_json = '{"theme": "dark", "language": "en"'  # Missing closing brace
+
+    response = client.put(
+        f"/api/users/{editor_user.id}",
+        data={"ui_settings": invalid_json},
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert "Invalid ui_settings JSON" in response.json()["detail"]
+
+
+@pytest.mark.parametrize(
+    "non_object_value",
+    [
+        '["array", "value"]',  # Array
+        '"string_value"',  # String
+        "123",  # Number
+        "true",  # Boolean
+        "null",  # Null
+    ],
+)
+def test_update_user_with_non_object_ui_settings(
+    client, access_token: str, editor_user: User, non_object_value: str
+):
+    """Test that updating ui_settings with non-object JSON returns 400."""
+    response = client.put(
+        f"/api/users/{editor_user.id}",
+        data={"ui_settings": non_object_value},
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert "Invalid ui_settings JSON" in response.json()["detail"]
+
+
+def test_update_user_ui_settings_empty_object(
+    client, access_token: str, editor_user: User
+):
+    """Test that updating ui_settings with an empty object is valid."""
+    response = client.put(
+        f"/api/users/{editor_user.id}",
+        data={"ui_settings": "{}"},
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == HTTPStatus.OK
+
+    user = response.json()
+    assert user["ui_settings"] == {}
+
+
+def test_update_user_ui_settings_nested_object(
+    client, access_token: str, editor_user: User
+):
+    """Test that nested objects in ui_settings are properly handled."""
+    nested_settings = {
+        "theme": {"mode": "dark", "accent": "blue"},
+        "layout": {"sidebar": {"collapsed": False, "width": 250}},
+        "preferences": {"autoSave": True, "confirmDelete": True},
+    }
+
+    response = client.put(
+        f"/api/users/{editor_user.id}",
+        data={"ui_settings": json.dumps(nested_settings)},
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == HTTPStatus.OK
+
+    user = response.json()
+    assert user["ui_settings"] == nested_settings

From ace8ed36796ffdcfa5a7ff0000d52f6c8f426bf3 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Wed, 24 Dec 2025 10:03:42 -0500
Subject: [PATCH 38/73] [ROMM-2791] Stop filtering out None values in order_by
 filter

---
 backend/handler/database/roms_handler.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 77acd2f74..bf6daa649 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -620,12 +620,10 @@ class DBRomsHandler(DBBaseHandler):
 
         if user_id and hasattr(RomUser, order_by) and not hasattr(Rom, order_by):
             order_attr = getattr(RomUser, order_by)
-            query = query.filter(RomUser.user_id == user_id, order_attr.isnot(None))
+            query = query.filter(RomUser.user_id == user_id)
         elif hasattr(RomMetadata, order_by) and not hasattr(Rom, order_by):
             order_attr = getattr(RomMetadata, order_by)
-            query = query.outerjoin(RomMetadata, RomMetadata.rom_id == Rom.id).filter(
-                order_attr.isnot(None)
-            )
+            query = query.outerjoin(RomMetadata, RomMetadata.rom_id == Rom.id)
         elif hasattr(Rom, order_by):
             order_attr = getattr(Rom, order_by)
         else:

From 3b531c47a28d55ddf491491d597ea640cc452c82 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 24 Dec 2025 15:07:40 +0000
Subject: [PATCH 39/73] feat: update tooltips and localization for filtering
 options in FilterDrawer components

---
 .../Gallery/AppBar/common/FilterDrawer/Base.vue |  4 ++--
 .../common/FilterDrawer/FilterDuplicatesBtn.vue |  4 ++--
 .../common/FilterDrawer/FilterFavoritesBtn.vue  |  4 ++--
 .../common/FilterDrawer/FilterMissingBtn.vue    |  4 ++--
 .../common/FilterDrawer/FilterPlatformBtn.vue   |  2 +-
 .../common/FilterDrawer/FilterPlayablesBtn.vue  |  4 ++--
 .../AppBar/common/FilterDrawer/FilterRaBtn.vue  |  4 ++--
 .../common/FilterDrawer/FilterVerifiedBtn.vue   |  8 ++++----
 frontend/src/locales/cs_CZ/platform.json        | 15 +++++++++++++++
 frontend/src/locales/de_DE/platform.json        | 15 +++++++++++++++
 frontend/src/locales/en_GB/platform.json        | 15 +++++++++++++++
 frontend/src/locales/en_US/platform.json        | 15 +++++++++++++++
 frontend/src/locales/es_ES/platform.json        | 15 +++++++++++++++
 frontend/src/locales/fr_FR/platform.json        | 15 +++++++++++++++
 frontend/src/locales/hu_HU/platform.json        | 15 +++++++++++++++
 frontend/src/locales/it_IT/platform.json        | 15 +++++++++++++++
 frontend/src/locales/ja_JP/platform.json        | 15 +++++++++++++++
 frontend/src/locales/ko_KR/platform.json        | 15 +++++++++++++++
 frontend/src/locales/pl_PL/platform.json        | 15 +++++++++++++++
 frontend/src/locales/pt_BR/platform.json        | 15 +++++++++++++++
 frontend/src/locales/ro_RO/platform.json        | 15 +++++++++++++++
 frontend/src/locales/ru_RU/platform.json        | 15 +++++++++++++++
 frontend/src/locales/zh_CN/platform.json        | 15 +++++++++++++++
 frontend/src/locales/zh_TW/platform.json        | 15 +++++++++++++++
 frontend/src/views/GameDetails.vue              | 17 ++++++++---------
 25 files changed, 265 insertions(+), 26 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index da8cd3221..edcdc417d 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -734,7 +734,7 @@ onMounted(async () => {
             "
           >
             <v-tooltip
-              text="Match ANY of the selected values (OR logic)"
+              :text="t('platform.match-any-logic')"
               location="bottom"
               open-delay="500"
             >
@@ -745,7 +745,7 @@ onMounted(async () => {
               </template>
             </v-tooltip>
             <v-tooltip
-              text="Match ALL of the selected values (AND logic)"
+              :text="t('platform.match-all-logic')"
               location="bottom"
               open-delay="500"
             >
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
index bee9fed31..158fbed20 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterDuplicatesBtn.vue
@@ -68,7 +68,7 @@ function setState(state: string | null) {
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
       <v-tooltip
-        text="Show duplicate ROMs only"
+        :text="t('platform.show-duplicates-only')"
         location="bottom"
         open-delay="500"
       >
@@ -84,7 +84,7 @@ function setState(state: string | null) {
         </template>
       </v-tooltip>
       <v-tooltip
-        text="Show non-duplicate ROMs only"
+        :text="t('platform.show-not-duplicates-only')"
         location="bottom"
         open-delay="500"
       >
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
index 65485468f..75ba0f1ab 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterFavoritesBtn.vue
@@ -61,7 +61,7 @@ function setState(state: string | null) {
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
       <v-tooltip
-        text="Show favorite ROMs only"
+        :text="t('platform.show-favorites-only')"
         location="bottom"
         open-delay="500"
       >
@@ -72,7 +72,7 @@ function setState(state: string | null) {
         </template>
       </v-tooltip>
       <v-tooltip
-        text="Show non-favorite ROMs only"
+        :text="t('platform.show-not-favorites-only')"
         location="bottom"
         open-delay="500"
       >
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
index 8eb38c264..710f5f53e 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterMissingBtn.vue
@@ -61,7 +61,7 @@ function setState(state: string | null) {
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
       <v-tooltip
-        text="Show missing ROMs only"
+        :text="t('platform.show-missing-only')"
         location="bottom"
         open-delay="500"
       >
@@ -72,7 +72,7 @@ function setState(state: string | null) {
         </template>
       </v-tooltip>
       <v-tooltip
-        text="Show non-missing ROMs only"
+        :text="t('platform.show-not-missing-only')"
         location="bottom"
         open-delay="500"
       >
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
index 32f8a220c..f9d26fc67 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlatformBtn.vue
@@ -57,7 +57,7 @@ const emitter = inject<Emitter<Events>>("emitter");
           <template #append>
             <MissingFromFSIcon
               v-if="item.raw.missing_from_fs"
-              text="Missing platform from filesystem"
+              :text="t('platform.missing-from-filesystem')"
               chip
               chip-label
               chip-density="compact"
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
index 0002e0412..3e89e7572 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterPlayablesBtn.vue
@@ -68,7 +68,7 @@ function setState(state: string | null) {
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
       <v-tooltip
-        text="Show playable ROMs only"
+        :text="t('platform.show-playables-only')"
         location="bottom"
         open-delay="500"
       >
@@ -84,7 +84,7 @@ function setState(state: string | null) {
         </template>
       </v-tooltip>
       <v-tooltip
-        text="Show non-playable ROMs only"
+        :text="t('platform.show-not-playables-only')"
         location="bottom"
         open-delay="500"
       >
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
index 4858fcd22..11f3fc5d7 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterRaBtn.vue
@@ -66,7 +66,7 @@ function setState(state: string | null) {
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
       <v-tooltip
-        text="Show ROMs with RetroAchievements only"
+        :text="t('platform.show-ra-only')"
         location="bottom"
         open-delay="500"
       >
@@ -82,7 +82,7 @@ function setState(state: string | null) {
         </template>
       </v-tooltip>
       <v-tooltip
-        text="Show ROMs without RetroAchievements only"
+        :text="t('platform.show-not-ra-only')"
         location="bottom"
         open-delay="500"
       >
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
index 1cb88db34..22d2bead6 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/FilterVerifiedBtn.vue
@@ -61,24 +61,24 @@ function setState(state: string | null) {
         ><v-icon size="x-large">mdi-cancel</v-icon>
       </v-btn>
       <v-tooltip
-        text="Show verified ROMs only"
+        :text="t('platform.show-verified-only')"
         location="bottom"
         open-delay="500"
       >
         <template #activator="{ props }">
           <v-btn value="verified" size="small" v-bind="props">
-            <v-icon size="x-large">mdi-check</v-icon>
+            <v-icon size="x-large">mdi-check-decagram-outline</v-icon>
           </v-btn>
         </template>
       </v-tooltip>
       <v-tooltip
-        text="Show non-verified ROMs only"
+        :text="t('platform.show-not-verified-only')"
         location="bottom"
         open-delay="500"
       >
         <template #activator="{ props }">
           <v-btn value="not-verified" size="small" v-bind="props">
-            <v-icon size="x-large">mdi-check-decagram-outline</v-icon>
+            <v-icon size="x-large">mdi-close-octagon-outline</v-icon>
           </v-btn>
         </template>
       </v-tooltip>
diff --git a/frontend/src/locales/cs_CZ/platform.json b/frontend/src/locales/cs_CZ/platform.json
index 9d9081b45..24f14ffee 100644
--- a/frontend/src/locales/cs_CZ/platform.json
+++ b/frontend/src/locales/cs_CZ/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Zobrazit Retroachievements",
   "show-unmatched": "Zobrazit neshody",
   "show-verified": "Zobrazit ověřené",
+  "show-verified-only": "Zobrazit pouze ověřené ROM",
+  "show-not-verified-only": "Zobrazit pouze neověřené ROM",
+  "show-duplicates-only": "Zobrazit pouze duplicitní ROM",
+  "show-not-duplicates-only": "Zobrazit pouze neduplicitní ROM",
+  "show-favorites-only": "Zobrazit pouze oblíbené ROM",
+  "show-not-favorites-only": "Zobrazit pouze neoblíbené ROM",
+  "show-missing-only": "Zobrazit pouze chybějící ROM",
+  "show-not-missing-only": "Zobrazit pouze nechybějící ROM",
+  "missing-from-filesystem": "Platforma chybí v systému souborů",
+  "show-playables-only": "Zobrazit pouze spustitelné ROM",
+  "show-not-playables-only": "Zobrazit pouze nespustitelné ROM",
+  "show-ra-only": "Zobrazit pouze ROM s RetroAchievements",
+  "show-not-ra-only": "Zobrazit pouze ROM bez RetroAchievements",
+  "match-any-logic": "Odpovídá KTERÉKOLI z vybraných hodnot (logika NEBO)",
+  "match-all-logic": "Odpovídá VŠEM vybraným hodnotám (logika A)",
   "status": "Stav",
   "upload-roms": "Nahrát ROMy"
 }
diff --git a/frontend/src/locales/de_DE/platform.json b/frontend/src/locales/de_DE/platform.json
index b481cb8c7..05e647e22 100644
--- a/frontend/src/locales/de_DE/platform.json
+++ b/frontend/src/locales/de_DE/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Zeige Retroachievements",
   "show-missing": "Zeige fehlende",
   "show-verified": "Zeige verifiziert",
+  "show-verified-only": "Zeige nur verifizierte ROMs",
+  "show-not-verified-only": "Zeige nur nicht verifizierte ROMs",
+  "show-duplicates-only": "Zeige nur doppelte ROMs",
+  "show-not-duplicates-only": "Zeige nur nicht doppelte ROMs",
+  "show-favorites-only": "Zeige nur Favoriten-ROMs",
+  "show-not-favorites-only": "Zeige nur Nicht-Favoriten-ROMs",
+  "show-missing-only": "Zeige nur fehlende ROMs",
+  "show-not-missing-only": "Zeige nur nicht fehlende ROMs",
+  "missing-from-filesystem": "Plattform fehlt im Dateisystem",
+  "show-playables-only": "Zeige nur spielbare ROMs",
+  "show-not-playables-only": "Zeige nur nicht spielbare ROMs",
+  "show-ra-only": "Zeige nur ROMs mit RetroAchievements",
+  "show-not-ra-only": "Zeige nur ROMs ohne RetroAchievements",
+  "match-any-logic": "Entspricht EINEM der ausgewählten Werte (ODER-Logik)",
+  "match-all-logic": "Entspricht ALLEN ausgewählten Werten (UND-Logik)",
   "status": "Status",
   "upload-roms": "Roms hochladen"
 }
diff --git a/frontend/src/locales/en_GB/platform.json b/frontend/src/locales/en_GB/platform.json
index e06c66c1b..1a20a177f 100644
--- a/frontend/src/locales/en_GB/platform.json
+++ b/frontend/src/locales/en_GB/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Show Retroachievements",
   "show-unmatched": "Show unmatched",
   "show-verified": "Show verified",
+  "show-verified-only": "Show verified ROMs only",
+  "show-not-verified-only": "Show non-verified ROMs only",
+  "show-duplicates-only": "Show duplicate ROMs only",
+  "show-not-duplicates-only": "Show non-duplicate ROMs only",
+  "show-favorites-only": "Show favourite ROMs only",
+  "show-not-favorites-only": "Show non-favourite ROMs only",
+  "show-missing-only": "Show missing ROMs only",
+  "show-not-missing-only": "Show non-missing ROMs only",
+  "missing-from-filesystem": "Missing platform from filesystem",
+  "show-playables-only": "Show playable ROMs only",
+  "show-not-playables-only": "Show non-playable ROMs only",
+  "show-ra-only": "Show ROMs with RetroAchievements only",
+  "show-not-ra-only": "Show ROMs without RetroAchievements only",
+  "match-any-logic": "Match ANY of the selected values (OR logic)",
+  "match-all-logic": "Match ALL of the selected values (AND logic)",
   "status": "Status",
   "upload-roms": "Upload Roms"
 }
diff --git a/frontend/src/locales/en_US/platform.json b/frontend/src/locales/en_US/platform.json
index e06c66c1b..1a20a177f 100644
--- a/frontend/src/locales/en_US/platform.json
+++ b/frontend/src/locales/en_US/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Show Retroachievements",
   "show-unmatched": "Show unmatched",
   "show-verified": "Show verified",
+  "show-verified-only": "Show verified ROMs only",
+  "show-not-verified-only": "Show non-verified ROMs only",
+  "show-duplicates-only": "Show duplicate ROMs only",
+  "show-not-duplicates-only": "Show non-duplicate ROMs only",
+  "show-favorites-only": "Show favourite ROMs only",
+  "show-not-favorites-only": "Show non-favourite ROMs only",
+  "show-missing-only": "Show missing ROMs only",
+  "show-not-missing-only": "Show non-missing ROMs only",
+  "missing-from-filesystem": "Missing platform from filesystem",
+  "show-playables-only": "Show playable ROMs only",
+  "show-not-playables-only": "Show non-playable ROMs only",
+  "show-ra-only": "Show ROMs with RetroAchievements only",
+  "show-not-ra-only": "Show ROMs without RetroAchievements only",
+  "match-any-logic": "Match ANY of the selected values (OR logic)",
+  "match-all-logic": "Match ALL of the selected values (AND logic)",
   "status": "Status",
   "upload-roms": "Upload Roms"
 }
diff --git a/frontend/src/locales/es_ES/platform.json b/frontend/src/locales/es_ES/platform.json
index c10d68484..a745c1d15 100644
--- a/frontend/src/locales/es_ES/platform.json
+++ b/frontend/src/locales/es_ES/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Mostrar Retroachievements",
   "show-missing": "Mostrar perdidos",
   "show-verified": "Mostrar verificados",
+  "show-verified-only": "Mostrar solo ROMs verificadas",
+  "show-not-verified-only": "Mostrar solo ROMs no verificadas",
+  "show-duplicates-only": "Mostrar solo ROMs duplicadas",
+  "show-not-duplicates-only": "Mostrar solo ROMs no duplicadas",
+  "show-favorites-only": "Mostrar solo ROMs favoritas",
+  "show-not-favorites-only": "Mostrar solo ROMs no favoritas",
+  "show-missing-only": "Mostrar solo ROMs perdidas",
+  "show-not-missing-only": "Mostrar solo ROMs no perdidas",
+  "missing-from-filesystem": "Plataforma faltante del sistema de archivos",
+  "show-playables-only": "Mostrar solo ROMs jugables",
+  "show-not-playables-only": "Mostrar solo ROMs no jugables",
+  "show-ra-only": "Mostrar solo ROMs con RetroAchievements",
+  "show-not-ra-only": "Mostrar solo ROMs sin RetroAchievements",
+  "match-any-logic": "Coincidir con CUALQUIERA de los valores seleccionados (lógica O)",
+  "match-all-logic": "Coincidir con TODOS los valores seleccionados (lógica Y)",
   "status": "Estado",
   "upload-roms": "Subir Roms"
 }
diff --git a/frontend/src/locales/fr_FR/platform.json b/frontend/src/locales/fr_FR/platform.json
index 7e4e73869..350adbea4 100644
--- a/frontend/src/locales/fr_FR/platform.json
+++ b/frontend/src/locales/fr_FR/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Afficher les Retroachievements",
   "show-missing": "Afficher les manquants",
   "show-verified": "Afficher les vérifiés",
+  "show-verified-only": "Afficher uniquement les ROMs vérifiées",
+  "show-not-verified-only": "Afficher uniquement les ROMs non vérifiées",
+  "show-duplicates-only": "Afficher uniquement les ROMs doublons",
+  "show-not-duplicates-only": "Afficher uniquement les ROMs non doublons",
+  "show-favorites-only": "Afficher uniquement les ROMs favorites",
+  "show-not-favorites-only": "Afficher uniquement les ROMs non favorites",
+  "show-missing-only": "Afficher uniquement les ROMs manquantes",
+  "show-not-missing-only": "Afficher uniquement les ROMs non manquantes",
+  "missing-from-filesystem": "Plateforme manquante du système de fichiers",
+  "show-playables-only": "Afficher uniquement les ROMs jouables",
+  "show-not-playables-only": "Afficher uniquement les ROMs non jouables",
+  "show-ra-only": "Afficher uniquement les ROMs avec RetroAchievements",
+  "show-not-ra-only": "Afficher uniquement les ROMs sans RetroAchievements",
+  "match-any-logic": "Correspond à N'IMPORTE QUELLE valeur sélectionnée (logique OU)",
+  "match-all-logic": "Correspond à TOUTES les valeurs sélectionnées (logique ET)",
   "status": "Statut",
   "upload-roms": "Télécharger des ROMs"
 }
diff --git a/frontend/src/locales/hu_HU/platform.json b/frontend/src/locales/hu_HU/platform.json
index 5dc6d7b2a..571e87396 100644
--- a/frontend/src/locales/hu_HU/platform.json
+++ b/frontend/src/locales/hu_HU/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Mutasd a Retroachievements",
   "show-unmatched": "Mutasd a nem egyezőket",
   "show-verified": "Mutasd az ellenőrzötteket",
+  "show-verified-only": "Csak ellenőrzött ROM-ok mutatása",
+  "show-not-verified-only": "Csak nem ellenőrzött ROM-ok mutatása",
+  "show-duplicates-only": "Csak duplikált ROM-ok mutatása",
+  "show-not-duplicates-only": "Csak nem duplikált ROM-ok mutatása",
+  "show-favorites-only": "Csak kedvenc ROM-ok mutatása",
+  "show-not-favorites-only": "Csak nem kedvenc ROM-ok mutatása",
+  "show-missing-only": "Csak hiányzó ROM-ok mutatása",
+  "show-not-missing-only": "Csak nem hiányzó ROM-ok mutatása",
+  "missing-from-filesystem": "Platform hiányzik a fájlrendszerből",
+  "show-playables-only": "Csak játszható ROM-ok mutatása",
+  "show-not-playables-only": "Csak nem játszható ROM-ok mutatása",
+  "show-ra-only": "Csak RetroAchievements-es ROM-ok mutatása",
+  "show-not-ra-only": "Csak RetroAchievements nélküli ROM-ok mutatása",
+  "match-any-logic": "Megfelel BÁRMELYIK kiválasztott értéknek (VAGY logika)",
+  "match-all-logic": "Megfelel MINDEN kiválasztott értéknek (ÉS logika)",
   "status": "Állapot",
   "upload-roms": "ROM-ok Feltöltése"
 }
diff --git a/frontend/src/locales/it_IT/platform.json b/frontend/src/locales/it_IT/platform.json
index 0c6d88b6b..ce77f8432 100644
--- a/frontend/src/locales/it_IT/platform.json
+++ b/frontend/src/locales/it_IT/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Mostra Retroachievements",
   "show-missing": "Mostra mancanti",
   "show-verified": "Mostra verificati",
+  "show-verified-only": "Mostra solo ROM verificate",
+  "show-not-verified-only": "Mostra solo ROM non verificate",
+  "show-duplicates-only": "Mostra solo ROM duplicate",
+  "show-not-duplicates-only": "Mostra solo ROM non duplicate",
+  "show-favorites-only": "Mostra solo ROM preferite",
+  "show-not-favorites-only": "Mostra solo ROM non preferite",
+  "show-missing-only": "Mostra solo ROM mancanti",
+  "show-not-missing-only": "Mostra solo ROM non mancanti",
+  "missing-from-filesystem": "Piattaforma mancante dal filesystem",
+  "show-playables-only": "Mostra solo ROM giocabili",
+  "show-not-playables-only": "Mostra solo ROM non giocabili",
+  "show-ra-only": "Mostra solo ROM con RetroAchievements",
+  "show-not-ra-only": "Mostra solo ROM senza RetroAchievements",
+  "match-any-logic": "Corrisponde a QUALSIASI dei valori selezionati (logica OR)",
+  "match-all-logic": "Corrisponde a TUTTI i valori selezionati (logica AND)",
   "status": "Stato",
   "upload-roms": "Carica Rom"
 }
diff --git a/frontend/src/locales/ja_JP/platform.json b/frontend/src/locales/ja_JP/platform.json
index 6a1523eae..ba15e8c34 100644
--- a/frontend/src/locales/ja_JP/platform.json
+++ b/frontend/src/locales/ja_JP/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Retroachievementsを表示",
   "show-missing": "欠落を表示",
   "show-verified": "確認済みを表示",
+  "show-verified-only": "確認済みROMのみを表示",
+  "show-not-verified-only": "未確認ROMのみを表示",
+  "show-duplicates-only": "重複ROMのみを表示",
+  "show-not-duplicates-only": "重複していないROMのみを表示",
+  "show-favorites-only": "お気に入りROMのみを表示",
+  "show-not-favorites-only": "お気に入りでないROMのみを表示",
+  "show-missing-only": "欠落ROMのみを表示",
+  "show-not-missing-only": "欠落していないROMのみを表示",
+  "missing-from-filesystem": "ファイルシステムにプラットフォームが存在しません",
+  "show-playables-only": "プレイ可能ROMのみを表示",
+  "show-not-playables-only": "プレイ不可ROMのみを表示",
+  "show-ra-only": "RetroAchievements付きROMのみを表示",
+  "show-not-ra-only": "RetroAchievementsなしROMのみを表示",
+  "match-any-logic": "選択した値のいずれかに一致（ORロジック）",
+  "match-all-logic": "選択した値のすべてに一致（ANDロジック）",
   "status": "ステータス",
   "upload-roms": "Romをアップロード"
 }
diff --git a/frontend/src/locales/ko_KR/platform.json b/frontend/src/locales/ko_KR/platform.json
index d9ea70830..140c2a10e 100644
--- a/frontend/src/locales/ko_KR/platform.json
+++ b/frontend/src/locales/ko_KR/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Retroachievements 보기",
   "show-missing": "누락된 항목 보기",
   "show-verified": "확인된 항목 보기",
+  "show-verified-only": "확인된 ROM만 표시",
+  "show-not-verified-only": "확인되지 않은 ROM만 표시",
+  "show-duplicates-only": "중복된 ROM만 표시",
+  "show-not-duplicates-only": "중복되지 않은 ROM만 표시",
+  "show-favorites-only": "즐겨찾기 ROM만 표시",
+  "show-not-favorites-only": "즐겨찾기가 아닌 ROM만 표시",
+  "show-missing-only": "누락된 ROM만 표시",
+  "show-not-missing-only": "누락되지 않은 ROM만 표시",
+  "missing-from-filesystem": "파일시스템에서 플랫폼 누락",
+  "show-playables-only": "플레이 가능한 ROM만 표시",
+  "show-not-playables-only": "플레이 불가능한 ROM만 표시",
+  "show-ra-only": "RetroAchievements가 있는 ROM만 표시",
+  "show-not-ra-only": "RetroAchievements가 없는 ROM만 표시",
+  "match-any-logic": "선택한 값 중 하나라도 일치 (OR 논리)",
+  "match-all-logic": "선택한 모든 값과 일치 (AND 논리)",
   "status": "플레이 상태",
   "upload-roms": "롬 업로드"
 }
diff --git a/frontend/src/locales/pl_PL/platform.json b/frontend/src/locales/pl_PL/platform.json
index 7c04c4365..4151170ff 100644
--- a/frontend/src/locales/pl_PL/platform.json
+++ b/frontend/src/locales/pl_PL/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Pokaż Retroachievements",
   "show-missing": "Pokaż brakujące",
   "show-verified": "Pokaż zweryfikowane",
+  "show-verified-only": "Pokaż tylko zweryfikowane ROMy",
+  "show-not-verified-only": "Pokaż tylko niezweryfikowane ROMy",
+  "show-duplicates-only": "Pokaż tylko zduplikowane ROMy",
+  "show-not-duplicates-only": "Pokaż tylko niezduplikowane ROMy",
+  "show-favorites-only": "Pokaż tylko ulubione ROMy",
+  "show-not-favorites-only": "Pokaż tylko nieulubione ROMy",
+  "show-missing-only": "Pokaż tylko brakujące ROMy",
+  "show-not-missing-only": "Pokaż tylko niebrakujące ROMy",
+  "missing-from-filesystem": "Platforma brakuje w systemie plików",
+  "show-playables-only": "Pokaż tylko grywalne ROMy",
+  "show-not-playables-only": "Pokaż tylko niegrywalne ROMy",
+  "show-ra-only": "Pokaż tylko ROMy z RetroAchievements",
+  "show-not-ra-only": "Pokaż tylko ROMy bez RetroAchievements",
+  "match-any-logic": "Dopasuj DO DOWOLNEJ z wybranych wartości (logika LUB)",
+  "match-all-logic": "Dopasuj DO WSZYSTKICH wybranych wartości (logika I)",
   "status": "Status",
   "upload-roms": "Prześlij ROMy"
 }
diff --git a/frontend/src/locales/pt_BR/platform.json b/frontend/src/locales/pt_BR/platform.json
index 93cb0c2ba..fcdcc485a 100644
--- a/frontend/src/locales/pt_BR/platform.json
+++ b/frontend/src/locales/pt_BR/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Mostrar Retroachievements",
   "show-missing": "Mostrar faltantes",
   "show-verified": "Mostrar verificados",
+  "show-verified-only": "Mostrar apenas ROMs verificadas",
+  "show-not-verified-only": "Mostrar apenas ROMs não verificadas",
+  "show-duplicates-only": "Mostrar apenas ROMs duplicadas",
+  "show-not-duplicates-only": "Mostrar apenas ROMs não duplicadas",
+  "show-favorites-only": "Mostrar apenas ROMs favoritas",
+  "show-not-favorites-only": "Mostrar apenas ROMs não favoritas",
+  "show-missing-only": "Mostrar apenas ROMs faltantes",
+  "show-not-missing-only": "Mostrar apenas ROMs não faltantes",
+  "missing-from-filesystem": "Plataforma ausente do sistema de arquivos",
+  "show-playables-only": "Mostrar apenas ROMs jogáveis",
+  "show-not-playables-only": "Mostrar apenas ROMs não jogáveis",
+  "show-ra-only": "Mostrar apenas ROMs com RetroAchievements",
+  "show-not-ra-only": "Mostrar apenas ROMs sem RetroAchievements",
+  "match-any-logic": "Corresponder a QUALQUER um dos valores selecionados (lógica OU)",
+  "match-all-logic": "Corresponder a TODOS os valores selecionados (lógica E)",
   "status": "Status",
   "upload-roms": "Carregar ROMs"
 }
diff --git a/frontend/src/locales/ro_RO/platform.json b/frontend/src/locales/ro_RO/platform.json
index 566e9705e..af71f35cd 100644
--- a/frontend/src/locales/ro_RO/platform.json
+++ b/frontend/src/locales/ro_RO/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Afișează Retroachievements",
   "show-missing": "Afișează lipsurile",
   "show-verified": "Afișează verificate",
+  "show-verified-only": "Afișează doar ROM-uri verificate",
+  "show-not-verified-only": "Afișează doar ROM-uri neverificate",
+  "show-duplicates-only": "Afișează doar ROM-uri duplicate",
+  "show-not-duplicates-only": "Afișează doar ROM-uri neduplicate",
+  "show-favorites-only": "Afișează doar ROM-uri favorite",
+  "show-not-favorites-only": "Afișează doar ROM-uri nefavorite",
+  "show-missing-only": "Afișează doar ROM-uri lipsă",
+  "show-not-missing-only": "Afișează doar ROM-uri nelipsă",
+  "missing-from-filesystem": "Platformă lipsă din sistemul de fișiere",
+  "show-playables-only": "Afișează doar ROM-uri jucabile",
+  "show-not-playables-only": "Afișează doar ROM-uri nejucabile",
+  "show-ra-only": "Afișează doar ROM-uri cu RetroAchievements",
+  "show-not-ra-only": "Afișează doar ROM-uri fără RetroAchievements",
+  "match-any-logic": "Corespunde ORICĂREIA dintre valorile selectate (logică SAU)",
+  "match-all-logic": "Corespunde TUTUROR valorilor selectate (logică ȘI)",
   "status": "Stare",
   "upload-roms": "Încărcare ROM-uri"
 }
diff --git a/frontend/src/locales/ru_RU/platform.json b/frontend/src/locales/ru_RU/platform.json
index 74b72344a..1008824e8 100644
--- a/frontend/src/locales/ru_RU/platform.json
+++ b/frontend/src/locales/ru_RU/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "Показать Retroachievements",
   "show-missing": "Показать отсутствующие",
   "show-verified": "Показать проверенные",
+  "show-verified-only": "Показать только проверенные ROM",
+  "show-not-verified-only": "Показать только непроверенные ROM",
+  "show-duplicates-only": "Показать только дубликаты ROM",
+  "show-not-duplicates-only": "Показать только недубликаты ROM",
+  "show-favorites-only": "Показать только избранные ROM",
+  "show-not-favorites-only": "Показать только неизбранные ROM",
+  "show-missing-only": "Показать только отсутствующие ROM",
+  "show-not-missing-only": "Показать только неотсутствующие ROM",
+  "missing-from-filesystem": "Платформа отсутствует в файловой системе",
+  "show-playables-only": "Показать только играбельные ROM",
+  "show-not-playables-only": "Показать только неиграбельные ROM",
+  "show-ra-only": "Показать только ROM с RetroAchievements",
+  "show-not-ra-only": "Показать только ROM без RetroAchievements",
+  "match-any-logic": "Соответствие ЛЮБОМУ из выбранных значений (логика ИЛИ)",
+  "match-all-logic": "Соответствие ВСЕМ выбранным значениям (логика И)",
   "status": "Статус",
   "upload-roms": "Загрузить ромы"
 }
diff --git a/frontend/src/locales/zh_CN/platform.json b/frontend/src/locales/zh_CN/platform.json
index 015812def..25d2e0bfe 100644
--- a/frontend/src/locales/zh_CN/platform.json
+++ b/frontend/src/locales/zh_CN/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "显示 Retroachievements",
   "show-missing": "显示缺失",
   "show-verified": "显示已验证",
+  "show-verified-only": "仅显示已验证的ROM",
+  "show-not-verified-only": "仅显示未验证的ROM",
+  "show-duplicates-only": "仅显示重复的ROM",
+  "show-not-duplicates-only": "仅显示非重复的ROM",
+  "show-favorites-only": "仅显示收藏的ROM",
+  "show-not-favorites-only": "仅显示未收藏的ROM",
+  "show-missing-only": "仅显示缺失的ROM",
+  "show-not-missing-only": "仅显示未缺失的ROM",
+  "missing-from-filesystem": "平台在文件系统中缺失",
+  "show-playables-only": "仅显示可玩的ROM",
+  "show-not-playables-only": "仅显示不可玩的ROM",
+  "show-ra-only": "仅显示有RetroAchievements的ROM",
+  "show-not-ra-only": "仅显示无RetroAchievements的ROM",
+  "match-any-logic": "匹配任何选定值（或逻辑）",
+  "match-all-logic": "匹配所有选定值（与逻辑）",
   "status": "状态",
   "upload-roms": "上传 Roms"
 }
diff --git a/frontend/src/locales/zh_TW/platform.json b/frontend/src/locales/zh_TW/platform.json
index 732a55883..405e8eafc 100644
--- a/frontend/src/locales/zh_TW/platform.json
+++ b/frontend/src/locales/zh_TW/platform.json
@@ -39,6 +39,21 @@
   "show-ra": "顯示 Retroachievements",
   "show-missing": "顯示缺失項目",
   "show-verified": "顯示已驗證項目",
+  "show-verified-only": "僅顯示已驗證的ROM",
+  "show-not-verified-only": "僅顯示未驗證的ROM",
+  "show-duplicates-only": "僅顯示重複的ROM",
+  "show-not-duplicates-only": "僅顯示非重複的ROM",
+  "show-favorites-only": "僅顯示喜好的ROM",
+  "show-not-favorites-only": "僅顯示非喜好的ROM",
+  "show-missing-only": "僅顯示缺失的ROM",
+  "show-not-missing-only": "僅顯示未缺失的ROM",
+  "missing-from-filesystem": "平台在檔案系統中缺失",
+  "show-playables-only": "僅顯示可遊玩的ROM",
+  "show-not-playables-only": "僅顯示不可遊玩的ROM",
+  "show-ra-only": "僅顯示有RetroAchievements的ROM",
+  "show-not-ra-only": "僅顯示無RetroAchievements的ROM",
+  "match-any-logic": "匹配任何選定值（或邏輯）",
+  "match-all-logic": "匹配所有選定值（與邏輯）",
   "status": "狀態",
   "upload-roms": "上傳 Rom"
 }
diff --git a/frontend/src/views/GameDetails.vue b/frontend/src/views/GameDetails.vue
index 74c73e45d..4ffa839d1 100644
--- a/frontend/src/views/GameDetails.vue
+++ b/frontend/src/views/GameDetails.vue
@@ -277,15 +277,14 @@ watch(
         </v-row>
       </v-col>
 
-      <v-col
-        v-if="
-          lgAndUp &&
-          (currentRom.igdb_metadata?.expansions?.length ||
-            currentRom.igdb_metadata?.dlcs?.length)
-        "
-        style="flex: 0 0 270px; width: 270px"
-      >
-        <v-container class="pa-0">
+      <v-col v-if="lgAndUp" style="flex: 0 0 270px; width: 270px">
+        <v-container
+          v-if="
+            currentRom.igdb_metadata?.expansions?.length ||
+            currentRom.igdb_metadata?.dlcs?.length
+          "
+          class="pa-0"
+        >
           <AdditionalContent class="mt-2" :rom="currentRom" />
         </v-container>
       </v-col>

From 415fb74bde39f6a847f5f7131d8a0eded1250eda Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 24 Dec 2025 15:14:42 +0000
Subject: [PATCH 40/73] trunk fmt

---
 frontend/src/stores/galleryFilter.ts | 48 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/frontend/src/stores/galleryFilter.ts b/frontend/src/stores/galleryFilter.ts
index bea53fb94..499e9564e 100644
--- a/frontend/src/stores/galleryFilter.ts
+++ b/frontend/src/stores/galleryFilter.ts
@@ -353,30 +353,30 @@ export default defineStore("galleryFilter", {
     isFiltered() {
       return Boolean(
         this.filterMatched !== null ||
-          this.filterFavorites !== null ||
-          this.filterDuplicates !== null ||
-          this.filterPlayables !== null ||
-          this.filterRA !== null ||
-          this.filterMissing !== null ||
-          this.filterVerified !== null ||
-          this.selectedPlatform ||
-          this.selectedPlatforms.length > 0 ||
-          this.selectedGenre ||
-          this.selectedGenres.length > 0 ||
-          this.selectedFranchise ||
-          this.selectedFranchises.length > 0 ||
-          this.selectedCollection ||
-          this.selectedCollections.length > 0 ||
-          this.selectedCompany ||
-          this.selectedCompanies.length > 0 ||
-          this.selectedAgeRating ||
-          this.selectedAgeRatings.length > 0 ||
-          this.selectedRegion ||
-          this.selectedRegions.length > 0 ||
-          this.selectedLanguage ||
-          this.selectedLanguages.length > 0 ||
-          this.selectedStatus ||
-          this.selectedStatuses.length > 0,
+        this.filterFavorites !== null ||
+        this.filterDuplicates !== null ||
+        this.filterPlayables !== null ||
+        this.filterRA !== null ||
+        this.filterMissing !== null ||
+        this.filterVerified !== null ||
+        this.selectedPlatform ||
+        this.selectedPlatforms.length > 0 ||
+        this.selectedGenre ||
+        this.selectedGenres.length > 0 ||
+        this.selectedFranchise ||
+        this.selectedFranchises.length > 0 ||
+        this.selectedCollection ||
+        this.selectedCollections.length > 0 ||
+        this.selectedCompany ||
+        this.selectedCompanies.length > 0 ||
+        this.selectedAgeRating ||
+        this.selectedAgeRatings.length > 0 ||
+        this.selectedRegion ||
+        this.selectedRegions.length > 0 ||
+        this.selectedLanguage ||
+        this.selectedLanguages.length > 0 ||
+        this.selectedStatus ||
+        this.selectedStatuses.length > 0,
       );
     },
     reset() {

From 48d6df9cc02dfb74a6af4dd6b2e4efb6ae448024 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 24 Dec 2025 15:23:44 +0000
Subject: [PATCH 41/73] feat: add logic operators for multi-value filters in
 collections and roms handlers

---
 .../handler/database/collections_handler.py   |  8 ++++
 backend/handler/database/roms_handler.py      |  8 ++++
 .../Dialog/CreateSmartCollection.vue          | 42 +++++++++++++++----
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
index 2852ca929..16fe2a66b 100644
--- a/backend/handler/database/collections_handler.py
+++ b/backend/handler/database/collections_handler.py
@@ -294,6 +294,14 @@ class DBCollectionsHandler(DBBaseHandler):
             selected_status=criteria.get("selected_status"),
             regions=regions,
             languages=languages,
+            # Logic operators for multi-value filters
+            genres_logic=criteria.get("genres_logic", "any"),
+            franchises_logic=criteria.get("franchises_logic", "any"),
+            collections_logic=criteria.get("collections_logic", "any"),
+            companies_logic=criteria.get("companies_logic", "any"),
+            age_ratings_logic=criteria.get("age_ratings_logic", "any"),
+            regions_logic=criteria.get("regions_logic", "any"),
+            languages_logic=criteria.get("languages_logic", "any"),
             user_id=user_id,
             order_by=criteria.get("order_by", "name"),
             order_dir=criteria.get("order_dir", "asc"),
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 8d5a8f563..f274e914f 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -735,6 +735,14 @@ class DBRomsHandler(DBBaseHandler):
             selected_status=kwargs.get("selected_status", None),
             regions=kwargs.get("regions", None),
             languages=kwargs.get("languages", None),
+            # Logic operators for multi-value filters
+            genres_logic=kwargs.get("genres_logic", "any"),
+            franchises_logic=kwargs.get("franchises_logic", "any"),
+            collections_logic=kwargs.get("collections_logic", "any"),
+            companies_logic=kwargs.get("companies_logic", "any"),
+            age_ratings_logic=kwargs.get("age_ratings_logic", "any"),
+            regions_logic=kwargs.get("regions_logic", "any"),
+            languages_logic=kwargs.get("languages_logic", "any"),
             user_id=kwargs.get("user_id", None),
         )
         return session.scalars(roms).all()
diff --git a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
index 3f8bd6f1c..d27663c8e 100644
--- a/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
+++ b/frontend/src/components/common/Collection/Dialog/CreateSmartCollection.vue
@@ -42,6 +42,13 @@ const {
   selectedPlatforms,
   selectedRegions,
   selectedLanguages,
+  genresLogic,
+  franchisesLogic,
+  collectionsLogic,
+  companiesLogic,
+  ageRatingsLogic,
+  regionsLogic,
+  languagesLogic,
 } = storeToRefs(galleryFilterStore);
 
 const emitter = inject<Emitter<Events>>("emitter");
@@ -133,16 +140,31 @@ async function createSmartCollection() {
     if (filterRA.value) filterCriteria.has_ra = true;
     if (filterMissing.value) filterCriteria.missing = true;
     if (filterVerified.value) filterCriteria.verified = true;
-    if (selectedGenres.value && selectedGenres.value.length > 0)
+    if (selectedGenres.value && selectedGenres.value.length > 0) {
       filterCriteria.genres = selectedGenres.value;
-    if (selectedFranchises.value && selectedFranchises.value.length > 0)
+      if (selectedGenres.value.length > 1)
+        filterCriteria.genres_logic = genresLogic.value;
+    }
+    if (selectedFranchises.value && selectedFranchises.value.length > 0) {
       filterCriteria.franchises = selectedFranchises.value;
-    if (selectedCollections.value && selectedCollections.value.length > 0)
+      if (selectedFranchises.value.length > 1)
+        filterCriteria.franchises_logic = franchisesLogic.value;
+    }
+    if (selectedCollections.value && selectedCollections.value.length > 0) {
       filterCriteria.collections = selectedCollections.value;
-    if (selectedCompanies.value && selectedCompanies.value.length > 0)
+      if (selectedCollections.value.length > 1)
+        filterCriteria.collections_logic = collectionsLogic.value;
+    }
+    if (selectedCompanies.value && selectedCompanies.value.length > 0) {
       filterCriteria.companies = selectedCompanies.value;
-    if (selectedAgeRatings.value && selectedAgeRatings.value.length > 0)
+      if (selectedCompanies.value.length > 1)
+        filterCriteria.companies_logic = companiesLogic.value;
+    }
+    if (selectedAgeRatings.value && selectedAgeRatings.value.length > 0) {
       filterCriteria.age_ratings = selectedAgeRatings.value;
+      if (selectedAgeRatings.value.length > 1)
+        filterCriteria.age_ratings_logic = ageRatingsLogic.value;
+    }
     if (selectedStatuses.value && selectedStatuses.value.length > 0) {
       const statusKeys = selectedStatuses.value
         .filter((s): s is string => s !== null)
@@ -152,10 +174,16 @@ async function createSmartCollection() {
         filterCriteria.selected_status = statusKeys;
       }
     }
-    if (selectedRegions.value && selectedRegions.value.length > 0)
+    if (selectedRegions.value && selectedRegions.value.length > 0) {
       filterCriteria.regions = selectedRegions.value;
-    if (selectedLanguages.value && selectedLanguages.value.length > 0)
+      if (selectedRegions.value.length > 1)
+        filterCriteria.regions_logic = regionsLogic.value;
+    }
+    if (selectedLanguages.value && selectedLanguages.value.length > 0) {
       filterCriteria.languages = selectedLanguages.value;
+      if (selectedLanguages.value.length > 1)
+        filterCriteria.languages_logic = languagesLogic.value;
+    }
 
     const { data } = await collectionApi.createSmartCollection({
       smartCollection: {

From a9560082596e60b5cbcb7246618c0d64ea41cdfb Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Thu, 25 Dec 2025 11:52:00 +0000
Subject: [PATCH 42/73] feat: update ROM filtering to support multi-value
 statuses and logic operators

---
 backend/endpoints/rom.py                      | 27 +++---
 .../handler/database/collections_handler.py   |  3 +-
 backend/handler/database/roms_handler.py      | 40 +++++----
 .../AppBar/common/FilterDrawer/Base.vue       | 85 ++-----------------
 frontend/src/services/api/rom.ts              | 65 ++++++++------
 frontend/src/services/cache/api.ts            | 58 ++++++++-----
 frontend/src/stores/galleryFilter.ts          | 48 -----------
 frontend/src/stores/roms.ts                   |  1 +
 8 files changed, 125 insertions(+), 202 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 55e557eed..5121eb469 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -262,7 +262,6 @@ def get_roms(
                 "Associated genre. Multiple values are allowed by repeating the"
                 " parameter, and results that match any of the values will be returned."
             ),
-            alias="genre",
         ),
     ] = None,
     franchises: Annotated[
@@ -272,7 +271,6 @@ def get_roms(
                 "Associated franchise. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will be returned."
             ),
-            alias="franchise",
         ),
     ] = None,
     collections: Annotated[
@@ -282,7 +280,6 @@ def get_roms(
                 "Associated collection. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will be returned."
             ),
-            alias="collection",
         ),
     ] = None,
     companies: Annotated[
@@ -292,7 +289,6 @@ def get_roms(
                 "Associated company. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will be returned."
             ),
-            alias="company",
         ),
     ] = None,
     age_ratings: Annotated[
@@ -302,12 +298,16 @@ def get_roms(
                 "Associated age rating. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will be returned."
             ),
-            alias="age_rating",
         ),
     ] = None,
-    selected_status: Annotated[
-        str | None,
-        Query(description="Game status, set by the current user."),
+    selected_statuses: Annotated[
+        list[str] | None,
+        Query(
+            description=(
+                "Game status, set by the current user. Multiple values are allowed by repeating"
+                " the parameter, and results that match any of the values will be returned."
+            ),
+        ),
     ] = None,
     regions: Annotated[
         list[str] | None,
@@ -316,7 +316,6 @@ def get_roms(
                 "Associated region tag. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will be returned."
             ),
-            alias="region",
         ),
     ] = None,
     languages: Annotated[
@@ -326,7 +325,6 @@ def get_roms(
                 "Associated language tag. Multiple values are allowed by repeating"
                 " the parameter, and results that match any of the values will be returned."
             ),
-            alias="language",
         ),
     ] = None,
     # Logic operators for multi-value filters
@@ -372,6 +370,12 @@ def get_roms(
             description="Logic operator for languages filter: 'any' (OR) or 'all' (AND).",
         ),
     ] = "any",
+    statuses_logic: Annotated[
+        str,
+        Query(
+            description="Logic operator for statuses filter: 'any' (OR) or 'all' (AND).",
+        ),
+    ] = "any",
     order_by: Annotated[
         str,
         Query(description="Field to order results by."),
@@ -409,7 +413,7 @@ def get_roms(
         collections=collections,
         companies=companies,
         age_ratings=age_ratings,
-        selected_status=selected_status,
+        selected_statuses=selected_statuses,
         regions=regions,
         languages=languages,
         # Logic operators
@@ -420,6 +424,7 @@ def get_roms(
         age_ratings_logic=age_ratings_logic,
         regions_logic=regions_logic,
         languages_logic=languages_logic,
+        statuses_logic=statuses_logic,
         group_by_meta_id=group_by_meta_id,
     )
 
diff --git a/backend/handler/database/collections_handler.py b/backend/handler/database/collections_handler.py
index 16fe2a66b..82798dc47 100644
--- a/backend/handler/database/collections_handler.py
+++ b/backend/handler/database/collections_handler.py
@@ -291,7 +291,7 @@ class DBCollectionsHandler(DBBaseHandler):
             collections=collections,
             companies=companies,
             age_ratings=age_ratings,
-            selected_status=criteria.get("selected_status"),
+            selected_statuses=criteria.get("selected_statuses"),
             regions=regions,
             languages=languages,
             # Logic operators for multi-value filters
@@ -302,6 +302,7 @@ class DBCollectionsHandler(DBBaseHandler):
             age_ratings_logic=criteria.get("age_ratings_logic", "any"),
             regions_logic=criteria.get("regions_logic", "any"),
             languages_logic=criteria.get("languages_logic", "any"),
+            statuses_logic=criteria.get("statuses_logic", "any"),
             user_id=user_id,
             order_by=criteria.get("order_by", "name"),
             order_dir=criteria.get("order_dir", "asc"),
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index f274e914f..ea18d1931 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -401,19 +401,27 @@ class DBRomsHandler(DBBaseHandler):
         op = json_array_contains_all if match_all else json_array_contains_any
         return query.filter(op(RomMetadata.age_ratings, values, session=session))
 
-    def filter_by_status(self, query: Query, selected_status: str):
-        status_filter = RomUser.status == selected_status
-        if selected_status == "now_playing":
-            status_filter = RomUser.now_playing.is_(True)
-        elif selected_status == "backlogged":
-            status_filter = RomUser.backlogged.is_(True)
-        elif selected_status == "hidden":
-            status_filter = RomUser.hidden.is_(True)
+    def filter_by_status(self, query: Query, selected_statuses: Sequence[str]):
+        """Filter by one or more user statuses using OR logic."""
+        if not selected_statuses:
+            return query
 
-        if selected_status == "hidden":
-            return query.filter(status_filter)
+        status_filters = []
+        for selected_status in selected_statuses:
+            if selected_status == "now_playing":
+                status_filters.append(RomUser.now_playing.is_(True))
+            elif selected_status == "backlogged":
+                status_filters.append(RomUser.backlogged.is_(True))
+            elif selected_status == "hidden":
+                status_filters.append(RomUser.hidden.is_(True))
+            else:
+                status_filters.append(RomUser.status == selected_status)
 
-        return query.filter(status_filter, RomUser.hidden.is_(False))
+        # If hidden is in the list, don't apply the hidden filter at the end
+        if "hidden" in selected_statuses:
+            return query.filter(or_(*status_filters))
+
+        return query.filter(or_(*status_filters), RomUser.hidden.is_(False))
 
     def filter_by_regions(
         self,
@@ -459,7 +467,7 @@ class DBRomsHandler(DBBaseHandler):
         collections: Sequence[str] | None = None,
         companies: Sequence[str] | None = None,
         age_ratings: Sequence[str] | None = None,
-        selected_status: str | None = None,
+        selected_statuses: Sequence[str] | None = None,
         regions: Sequence[str] | None = None,
         languages: Sequence[str] | None = None,
         # Logic operators for multi-value filters
@@ -470,6 +478,7 @@ class DBRomsHandler(DBBaseHandler):
         age_ratings_logic: str = "any",
         regions_logic: str = "any",
         languages_logic: str = "any",
+        statuses_logic: str = "any",
         user_id: int | None = None,
         session: Session = None,  # type: ignore
     ) -> Query[Rom]:
@@ -648,8 +657,8 @@ class DBRomsHandler(DBBaseHandler):
                 )
 
         # The RomUser table is already joined if user_id is set
-        if selected_status and user_id:
-            query = self.filter_by_status(query, selected_status)
+        if selected_statuses and user_id:
+            query = self.filter_by_status(query, selected_statuses)
         elif user_id:
             query = query.filter(
                 or_(RomUser.hidden.is_(False), RomUser.hidden.is_(None))
@@ -732,7 +741,7 @@ class DBRomsHandler(DBBaseHandler):
             collections=kwargs.get("collections", None),
             companies=kwargs.get("companies", None),
             age_ratings=kwargs.get("age_ratings", None),
-            selected_status=kwargs.get("selected_status", None),
+            selected_statuses=kwargs.get("selected_statuses", None),
             regions=kwargs.get("regions", None),
             languages=kwargs.get("languages", None),
             # Logic operators for multi-value filters
@@ -743,6 +752,7 @@ class DBRomsHandler(DBBaseHandler):
             age_ratings_logic=kwargs.get("age_ratings_logic", "any"),
             regions_logic=kwargs.get("regions_logic", "any"),
             languages_logic=kwargs.get("languages_logic", "any"),
+            statuses_logic=kwargs.get("statuses_logic", "any"),
             user_id=kwargs.get("user_id", None),
         )
         return session.scalars(roms).all()
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index edcdc417d..05c902fcd 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -50,36 +50,28 @@ const {
   filterRA,
   filterMissing,
   filterVerified,
-  selectedGenre,
   filterGenres,
   selectedGenres,
   genresLogic,
-  selectedFranchise,
   filterFranchises,
   selectedFranchises,
   franchisesLogic,
-  selectedCollection,
   filterCollections,
   selectedCollections,
   collectionsLogic,
-  selectedCompany,
   filterCompanies,
   selectedCompanies,
   companiesLogic,
-  selectedAgeRating,
   filterAgeRatings,
   selectedAgeRatings,
   ageRatingsLogic,
-  selectedStatus,
   filterStatuses,
   selectedStatuses,
   statusesLogic,
   selectedPlatforms,
-  selectedRegion,
   filterRegions,
   selectedRegions,
   regionsLogic,
-  selectedLanguage,
   filterLanguages,
   selectedLanguages,
   languagesLogic,
@@ -97,98 +89,61 @@ const onFilterChange = debounce(
     Object.entries({
       search: searchTerm.value,
       matched:
-        filterMatched.value === true
-          ? "true"
-          : filterMatched.value === false
-            ? "false"
-            : null,
+        filterMatched.value === null ? null : String(filterMatched.value),
       filterFavorites:
-        filterFavorites.value === true
-          ? "true"
-          : filterFavorites.value === false
-            ? "false"
-            : null,
+        filterFavorites.value === null ? null : String(filterFavorites.value),
       filterDuplicates:
-        filterDuplicates.value === true
-          ? "true"
-          : filterDuplicates.value === false
-            ? "false"
-            : null,
+        filterDuplicates.value === null ? null : String(filterDuplicates.value),
       filterPlayables:
-        filterPlayables.value === true
-          ? "true"
-          : filterPlayables.value === false
-            ? "false"
-            : null,
+        filterPlayables.value === null ? null : String(filterPlayables.value),
       filterMissing:
-        filterMissing.value === true
-          ? "true"
-          : filterMissing.value === false
-            ? "false"
-            : null,
+        filterMissing.value === null ? null : String(filterMissing.value),
       filterVerified:
-        filterVerified.value === true
-          ? "true"
-          : filterVerified.value === false
-            ? "false"
-            : null,
-      filterRA:
-        filterRA.value === true
-          ? "true"
-          : filterRA.value === false
-            ? "false"
-            : null,
+        filterVerified.value === null ? null : String(filterVerified.value),
+      filterRA: filterRA.value === null ? null : String(filterRA.value),
       platforms:
         selectedPlatforms.value.length > 0
           ? selectedPlatforms.value.map((p) => String(p.id)).join(",")
           : null,
-      genre: selectedGenre.value,
       genres:
         selectedGenres.value.length > 0 ? selectedGenres.value.join(",") : null,
       genresLogic: selectedGenres.value.length > 1 ? genresLogic.value : null,
-      franchise: selectedFranchise.value,
       franchises:
         selectedFranchises.value.length > 0
           ? selectedFranchises.value.join(",")
           : null,
       franchisesLogic:
         selectedFranchises.value.length > 1 ? franchisesLogic.value : null,
-      collection: selectedCollection.value,
       collections:
         selectedCollections.value.length > 0
           ? selectedCollections.value.join(",")
           : null,
       collectionsLogic:
         selectedCollections.value.length > 1 ? collectionsLogic.value : null,
-      company: selectedCompany.value,
       companies:
         selectedCompanies.value.length > 0
           ? selectedCompanies.value.join(",")
           : null,
       companiesLogic:
         selectedCompanies.value.length > 1 ? companiesLogic.value : null,
-      ageRating: selectedAgeRating.value,
       ageRatings:
         selectedAgeRatings.value.length > 0
           ? selectedAgeRatings.value.join(",")
           : null,
       ageRatingsLogic:
         selectedAgeRatings.value.length > 1 ? ageRatingsLogic.value : null,
-      region: selectedRegion.value,
       regions:
         selectedRegions.value.length > 0
           ? selectedRegions.value.join(",")
           : null,
       regionsLogic:
         selectedRegions.value.length > 1 ? regionsLogic.value : null,
-      language: selectedLanguage.value,
       languages:
         selectedLanguages.value.length > 0
           ? selectedLanguages.value.join(",")
           : null,
       languagesLogic:
         selectedLanguages.value.length > 1 ? languagesLogic.value : null,
-      status: selectedStatus.value,
       statuses:
         selectedStatuses.value.length > 0
           ? selectedStatuses.value.join(",")
@@ -409,15 +364,6 @@ onMounted(async () => {
     filterRA: urlFilteredRa,
     platform: urlPlatform,
     platforms: urlPlatforms,
-    // Single value URL params (backward compatibility)
-    genre: urlGenre,
-    franchise: urlFranchise,
-    collection: urlCollection,
-    company: urlCompany,
-    ageRating: urlAgeRating,
-    region: urlRegion,
-    language: urlLanguage,
-    status: urlStatus,
     // Multi-value URL params
     genres: urlGenres,
     genresLogic: urlGenresLogic,
@@ -523,9 +469,6 @@ onMounted(async () => {
     if (urlGenresLogic !== undefined) {
       galleryFilterStore.setGenresLogic(urlGenresLogic as "any" | "all");
     }
-  } else if (urlGenre !== undefined) {
-    // Backward compatibility: if single genre is set, convert to multiselect
-    galleryFilterStore.setSelectedFilterGenres([urlGenre as string]);
   }
 
   if (urlFranchises !== undefined) {
@@ -538,8 +481,6 @@ onMounted(async () => {
         urlFranchisesLogic as "any" | "all",
       );
     }
-  } else if (urlFranchise !== undefined) {
-    galleryFilterStore.setSelectedFilterFranchises([urlFranchise as string]);
   }
 
   if (urlCollections !== undefined) {
@@ -552,8 +493,6 @@ onMounted(async () => {
         urlCollectionsLogic as "any" | "all",
       );
     }
-  } else if (urlCollection !== undefined) {
-    galleryFilterStore.setSelectedFilterCollections([urlCollection as string]);
   }
 
   if (urlCompanies !== undefined) {
@@ -564,8 +503,6 @@ onMounted(async () => {
     if (urlCompaniesLogic !== undefined) {
       galleryFilterStore.setCompaniesLogic(urlCompaniesLogic as "any" | "all");
     }
-  } else if (urlCompany !== undefined) {
-    galleryFilterStore.setSelectedFilterCompanies([urlCompany as string]);
   }
 
   if (urlAgeRatings !== undefined) {
@@ -578,8 +515,6 @@ onMounted(async () => {
         urlAgeRatingsLogic as "any" | "all",
       );
     }
-  } else if (urlAgeRating !== undefined) {
-    galleryFilterStore.setSelectedFilterAgeRatings([urlAgeRating as string]);
   }
 
   if (urlRegions !== undefined) {
@@ -588,8 +523,6 @@ onMounted(async () => {
     if (urlRegionsLogic !== undefined) {
       galleryFilterStore.setRegionsLogic(urlRegionsLogic as "any" | "all");
     }
-  } else if (urlRegion !== undefined) {
-    galleryFilterStore.setSelectedFilterRegions([urlRegion as string]);
   }
 
   if (urlLanguages !== undefined) {
@@ -600,8 +533,6 @@ onMounted(async () => {
     if (urlLanguagesLogic !== undefined) {
       galleryFilterStore.setLanguagesLogic(urlLanguagesLogic as "any" | "all");
     }
-  } else if (urlLanguage !== undefined) {
-    galleryFilterStore.setSelectedFilterLanguages([urlLanguage as string]);
   }
 
   if (urlStatuses !== undefined) {
@@ -610,8 +541,6 @@ onMounted(async () => {
     if (urlStatusesLogic !== undefined) {
       galleryFilterStore.setStatusesLogic(urlStatusesLogic as "any" | "all");
     }
-  } else if (urlStatus !== undefined) {
-    galleryFilterStore.setSelectedFilterStatuses([urlStatus as string]);
   }
 
   // Check if search term is set in the URL (empty string is ok)
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index 93dbc9fb7..e6c63634f 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -10,8 +10,7 @@ import socket from "@/services/socket";
 import storeHeartbeat from "@/stores/heartbeat";
 import type { DetailedRom, SimpleRom, SearchRom } from "@/stores/roms";
 import storeUpload from "@/stores/upload";
-import { getDownloadPath, getStatusKeyForText } from "@/utils";
-import { getFilterArray } from "@/utils/apiHelpers";
+import { getDownloadPath } from "@/utils";
 
 export const romApi = api;
 
@@ -79,15 +78,6 @@ export interface GetRomsParams {
   filterMissing?: boolean | null;
   filterVerified?: boolean | null;
   groupByMetaId?: boolean;
-  // Single value filters (for backward compatibility)
-  selectedGenre?: string | null;
-  selectedFranchise?: string | null;
-  selectedCollection?: string | null;
-  selectedCompany?: string | null;
-  selectedAgeRating?: string | null;
-  selectedStatus?: string | null;
-  selectedRegion?: string | null;
-  selectedLanguage?: string | null;
   // Multi-value filters
   selectedGenres?: string[] | null;
   selectedFranchises?: string[] | null;
@@ -105,6 +95,7 @@ export interface GetRomsParams {
   ageRatingsLogic?: string | null;
   regionsLogic?: string | null;
   languagesLogic?: string | null;
+  statusesLogic?: string | null;
 }
 
 async function getRoms({
@@ -125,14 +116,6 @@ async function getRoms({
   filterMissing = false,
   filterVerified = false,
   groupByMetaId = false,
-  selectedGenre = null,
-  selectedFranchise = null,
-  selectedCollection = null,
-  selectedCompany = null,
-  selectedAgeRating = null,
-  selectedStatus = null,
-  selectedRegion = null,
-  selectedLanguage = null,
   selectedGenres = null,
   selectedFranchises = null,
   selectedCollections = null,
@@ -140,6 +123,7 @@ async function getRoms({
   selectedAgeRatings = null,
   selectedRegions = null,
   selectedLanguages = null,
+  selectedStatuses = null,
   // Logic operators
   genresLogic = null,
   franchisesLogic = null,
@@ -148,6 +132,7 @@ async function getRoms({
   ageRatingsLogic = null,
   regionsLogic = null,
   languagesLogic = null,
+  statusesLogic = null,
 }: GetRomsParams): Promise<{ data: GetRomsResponse }> {
   const params = {
     platform_ids:
@@ -161,14 +146,36 @@ async function getRoms({
     order_by: orderBy,
     order_dir: orderDir,
     group_by_meta_id: groupByMetaId,
-    genre: getFilterArray(selectedGenre, selectedGenres),
-    franchise: getFilterArray(selectedFranchise, selectedFranchises),
-    collection: getFilterArray(selectedCollection, selectedCollections),
-    company: getFilterArray(selectedCompany, selectedCompanies),
-    age_rating: getFilterArray(selectedAgeRating, selectedAgeRatings),
-    selected_status: getStatusKeyForText(selectedStatus),
-    region: getFilterArray(selectedRegion, selectedRegions),
-    language: getFilterArray(selectedLanguage, selectedLanguages),
+    genres:
+      selectedGenres && selectedGenres.length > 0 ? selectedGenres : undefined,
+    franchises:
+      selectedFranchises && selectedFranchises.length > 0
+        ? selectedFranchises
+        : undefined,
+    collections:
+      selectedCollections && selectedCollections.length > 0
+        ? selectedCollections
+        : undefined,
+    companies:
+      selectedCompanies && selectedCompanies.length > 0
+        ? selectedCompanies
+        : undefined,
+    age_ratings:
+      selectedAgeRatings && selectedAgeRatings.length > 0
+        ? selectedAgeRatings
+        : undefined,
+    selected_statuses:
+      selectedStatuses && selectedStatuses.length > 0
+        ? selectedStatuses
+        : undefined,
+    regions:
+      selectedRegions && selectedRegions.length > 0
+        ? selectedRegions
+        : undefined,
+    languages:
+      selectedLanguages && selectedLanguages.length > 0
+        ? selectedLanguages
+        : undefined,
     // Logic operators
     genres_logic:
       selectedGenres && selectedGenres.length > 1
@@ -198,6 +205,10 @@ async function getRoms({
       selectedLanguages && selectedLanguages.length > 1
         ? languagesLogic || "any"
         : undefined,
+    statuses_logic:
+      selectedStatuses && selectedStatuses.length > 1
+        ? statusesLogic || "any"
+        : undefined,
     ...(filterMatched !== null ? { matched: filterMatched } : {}),
     ...(filterFavorites !== null ? { favorite: filterFavorites } : {}),
     ...(filterDuplicates !== null ? { duplicate: filterDuplicates } : {}),
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index 1dc0bc92d..f68ce171b 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -8,8 +8,6 @@ import type {
 import type { CustomLimitOffsetPage_SimpleRomSchema_ as GetRomsResponse } from "@/__generated__/models/CustomLimitOffsetPage_SimpleRomSchema_";
 import type { GetRomsParams } from "@/services/api/rom";
 import cacheService from "@/services/cache";
-import { getStatusKeyForText } from "@/utils";
-import { getFilterArray } from "@/utils/apiHelpers";
 
 class CachedApiService {
   private createRequestConfig(
@@ -44,26 +42,38 @@ class CachedApiService {
       order_by: params.orderBy,
       order_dir: params.orderDir,
       group_by_meta_id: params.groupByMetaId,
-      genre: getFilterArray(params.selectedGenre, params.selectedGenres),
-      franchise: getFilterArray(
-        params.selectedFranchise,
-        params.selectedFranchises,
-      ),
-      collection: getFilterArray(
-        params.selectedCollection,
-        params.selectedCollections,
-      ),
-      company: getFilterArray(params.selectedCompany, params.selectedCompanies),
-      age_rating: getFilterArray(
-        params.selectedAgeRating,
-        params.selectedAgeRatings,
-      ),
-      selected_status: getStatusKeyForText(params.selectedStatus ?? null),
-      region: getFilterArray(params.selectedRegion, params.selectedRegions),
-      language: getFilterArray(
-        params.selectedLanguage,
-        params.selectedLanguages,
-      ),
+      genres:
+        params.selectedGenres && params.selectedGenres.length > 0
+          ? params.selectedGenres
+          : undefined,
+      franchises:
+        params.selectedFranchises && params.selectedFranchises.length > 0
+          ? params.selectedFranchises
+          : undefined,
+      collections:
+        params.selectedCollections && params.selectedCollections.length > 0
+          ? params.selectedCollections
+          : undefined,
+      companies:
+        params.selectedCompanies && params.selectedCompanies.length > 0
+          ? params.selectedCompanies
+          : undefined,
+      age_ratings:
+        params.selectedAgeRatings && params.selectedAgeRatings.length > 0
+          ? params.selectedAgeRatings
+          : undefined,
+      selected_statuses:
+        params.selectedStatuses && params.selectedStatuses.length > 0
+          ? params.selectedStatuses
+          : undefined,
+      regions:
+        params.selectedRegions && params.selectedRegions.length > 0
+          ? params.selectedRegions
+          : undefined,
+      languages:
+        params.selectedLanguages && params.selectedLanguages.length > 0
+          ? params.selectedLanguages
+          : undefined,
       // Logic operators
       genres_logic:
         params.selectedGenres && params.selectedGenres.length > 1
@@ -93,6 +103,10 @@ class CachedApiService {
         params.selectedLanguages && params.selectedLanguages.length > 1
           ? params.languagesLogic || "any"
           : undefined,
+      statuses_logic:
+        params.selectedStatuses && params.selectedStatuses.length > 1
+          ? params.statusesLogic || "any"
+          : undefined,
       ...(params.filterMatched !== null
         ? { matched: params.filterMatched }
         : {}),
diff --git a/frontend/src/stores/galleryFilter.ts b/frontend/src/stores/galleryFilter.ts
index 499e9564e..af86b21a4 100644
--- a/frontend/src/stores/galleryFilter.ts
+++ b/frontend/src/stores/galleryFilter.ts
@@ -35,21 +35,13 @@ const defaultFilterState = {
   filterVerified: null as boolean | null, // null = all, true = verified, false = not verified
   selectedPlatform: null as Platform | null,
   selectedPlatforms: [] as Platform[],
-  selectedGenre: null as string | null,
   selectedGenres: [] as string[],
-  selectedFranchise: null as string | null,
   selectedFranchises: [] as string[],
-  selectedCollection: null as string | null,
   selectedCollections: [] as string[],
-  selectedCompany: null as string | null,
   selectedCompanies: [] as string[],
-  selectedAgeRating: null as string | null,
   selectedAgeRatings: [] as string[],
-  selectedRegion: null as string | null,
   selectedRegions: [] as string[],
-  selectedLanguage: null as string | null,
   selectedLanguages: [] as string[],
-  selectedStatus: null as string | null,
   selectedStatuses: [] as string[],
   // Logic operators for multi-select filters
   genresLogic: "any" as "any" | "all",
@@ -103,72 +95,48 @@ export default defineStore("galleryFilter", {
       // Clear single platform selection to avoid conflicts
       this.selectedPlatform = null;
     },
-    setSelectedFilterGenre(genre: string) {
-      this.selectedGenre = genre;
-    },
     setSelectedFilterGenres(genres: string[]) {
       this.selectedGenres = genres;
     },
     setGenresLogic(logic: "any" | "all") {
       this.genresLogic = logic;
     },
-    setSelectedFilterFranchise(franchise: string) {
-      this.selectedFranchise = franchise;
-    },
     setSelectedFilterFranchises(franchises: string[]) {
       this.selectedFranchises = franchises;
     },
     setFranchisesLogic(logic: "any" | "all") {
       this.franchisesLogic = logic;
     },
-    setSelectedFilterCollection(collection: string) {
-      this.selectedCollection = collection;
-    },
     setSelectedFilterCollections(collections: string[]) {
       this.selectedCollections = collections;
     },
     setCollectionsLogic(logic: "any" | "all") {
       this.collectionsLogic = logic;
     },
-    setSelectedFilterCompany(company: string) {
-      this.selectedCompany = company;
-    },
     setSelectedFilterCompanies(companies: string[]) {
       this.selectedCompanies = companies;
     },
     setCompaniesLogic(logic: "any" | "all") {
       this.companiesLogic = logic;
     },
-    setSelectedFilterAgeRating(ageRating: string) {
-      this.selectedAgeRating = ageRating;
-    },
     setSelectedFilterAgeRatings(ageRatings: string[]) {
       this.selectedAgeRatings = ageRatings;
     },
     setAgeRatingsLogic(logic: "any" | "all") {
       this.ageRatingsLogic = logic;
     },
-    setSelectedFilterRegion(region: string) {
-      this.selectedRegion = region;
-    },
     setSelectedFilterRegions(regions: string[]) {
       this.selectedRegions = regions;
     },
     setRegionsLogic(logic: "any" | "all") {
       this.regionsLogic = logic;
     },
-    setSelectedFilterLanguage(language: string) {
-      this.selectedLanguage = language;
-    },
     setSelectedFilterLanguages(languages: string[]) {
       this.selectedLanguages = languages;
     },
     setLanguagesLogic(logic: "any" | "all") {
       this.languagesLogic = logic;
     },
-    setSelectedFilterStatus(status: string) {
-      this.selectedStatus = status;
-    },
     setSelectedFilterStatuses(statuses: string[]) {
       this.selectedStatuses = statuses;
     },
@@ -361,21 +329,13 @@ export default defineStore("galleryFilter", {
         this.filterVerified !== null ||
         this.selectedPlatform ||
         this.selectedPlatforms.length > 0 ||
-        this.selectedGenre ||
         this.selectedGenres.length > 0 ||
-        this.selectedFranchise ||
         this.selectedFranchises.length > 0 ||
-        this.selectedCollection ||
         this.selectedCollections.length > 0 ||
-        this.selectedCompany ||
         this.selectedCompanies.length > 0 ||
-        this.selectedAgeRating ||
         this.selectedAgeRatings.length > 0 ||
-        this.selectedRegion ||
         this.selectedRegions.length > 0 ||
-        this.selectedLanguage ||
         this.selectedLanguages.length > 0 ||
-        this.selectedStatus ||
         this.selectedStatuses.length > 0,
       );
     },
@@ -385,21 +345,13 @@ export default defineStore("galleryFilter", {
     resetFilters() {
       this.selectedPlatform = null;
       this.selectedPlatforms = [];
-      this.selectedGenre = null;
       this.selectedGenres = [];
-      this.selectedFranchise = null;
       this.selectedFranchises = [];
-      this.selectedCollection = null;
       this.selectedCollections = [];
-      this.selectedCompany = null;
       this.selectedCompanies = [];
-      this.selectedAgeRating = null;
       this.selectedAgeRatings = [];
-      this.selectedRegion = null;
       this.selectedRegions = [];
-      this.selectedLanguage = null;
       this.selectedLanguages = [];
-      this.selectedStatus = null;
       this.selectedStatuses = [];
       this.filterMatched = null;
       this.filterFavorites = null;
diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 0ae1dd4b5..86176c836 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -153,6 +153,7 @@ export default defineStore("roms", {
         ageRatingsLogic: galleryFilter.ageRatingsLogic,
         regionsLogic: galleryFilter.regionsLogic,
         languagesLogic: galleryFilter.languagesLogic,
+        statusesLogic: galleryFilter.statusesLogic,
       };
       return params;
     },

From 1408743652d1404a35a20524971170625744bf9d Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 26 Dec 2025 09:08:19 +0000
Subject: [PATCH 43/73] feat: update selected filter variables to plural for
 consistency in random game selection

---
 .../AppBar/common/ContextualRandomBtn.vue     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue b/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue
index 7c7231219..6af07f3c8 100644
--- a/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue
+++ b/frontend/src/components/Gallery/AppBar/common/ContextualRandomBtn.vue
@@ -31,14 +31,14 @@ const {
   filterRA,
   filterMissing,
   filterVerified,
-  selectedGenre,
-  selectedFranchise,
-  selectedCollection,
-  selectedCompany,
-  selectedAgeRating,
-  selectedStatus,
-  selectedRegion,
-  selectedLanguage,
+  selectedGenres,
+  selectedFranchises,
+  selectedCollections,
+  selectedCompanies,
+  selectedAgeRatings,
+  selectedStatuses,
+  selectedRegions,
+  selectedLanguages,
 } = storeToRefs(galleryFilterStore);
 
 async function goToRandomGame() {
@@ -61,14 +61,14 @@ async function goToRandomGame() {
       filterRA: filterRA.value,
       filterMissing: filterMissing.value,
       filterVerified: filterVerified.value,
-      selectedGenre: selectedGenre.value,
-      selectedFranchise: selectedFranchise.value,
-      selectedCollection: selectedCollection.value,
-      selectedCompany: selectedCompany.value,
-      selectedAgeRating: selectedAgeRating.value,
-      selectedStatus: selectedStatus.value,
-      selectedRegion: selectedRegion.value,
-      selectedLanguage: selectedLanguage.value,
+      selectedGenres: selectedGenres.value,
+      selectedFranchises: selectedFranchises.value,
+      selectedCollections: selectedCollections.value,
+      selectedCompanies: selectedCompanies.value,
+      selectedAgeRatings: selectedAgeRatings.value,
+      selectedStatuses: selectedStatuses.value,
+      selectedRegions: selectedRegions.value,
+      selectedLanguages: selectedLanguages.value,
     };
 
     // Get the total count first

From 4c2ba029f22e87f9c48f65f5eafe41a6269bc147 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Fri, 26 Dec 2025 09:18:59 +0000
Subject: [PATCH 44/73] feat: remove single-value genre and filter selections
 for multi-value support

---
 frontend/src/stores/roms.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/src/stores/roms.ts b/frontend/src/stores/roms.ts
index 86176c836..ccc5c4091 100644
--- a/frontend/src/stores/roms.ts
+++ b/frontend/src/stores/roms.ts
@@ -128,15 +128,6 @@ export default defineStore("roms", {
         filterRA: galleryFilter.filterRA,
         filterMissing: galleryFilter.filterMissing,
         filterVerified: galleryFilter.filterVerified,
-        // Single and multi-value filters are handled by the API layer
-        selectedGenre: galleryFilter.selectedGenre,
-        selectedFranchise: galleryFilter.selectedFranchise,
-        selectedCollection: galleryFilter.selectedCollection,
-        selectedCompany: galleryFilter.selectedCompany,
-        selectedAgeRating: galleryFilter.selectedAgeRating,
-        selectedStatus: galleryFilter.selectedStatus,
-        selectedRegion: galleryFilter.selectedRegion,
-        selectedLanguage: galleryFilter.selectedLanguage,
         selectedGenres: galleryFilter.selectedGenres,
         selectedFranchises: galleryFilter.selectedFranchises,
         selectedCollections: galleryFilter.selectedCollections,

From eebca34e533697368bc2e3dd9de626799022f858 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Fri, 26 Dec 2025 11:53:30 -0500
Subject: [PATCH 45/73] [ROMM-2806] Fix arcade ssid in screenscraper

---
 backend/handler/metadata/ss_handler.py | 82 +++-----------------------
 1 file changed, 7 insertions(+), 75 deletions(-)

diff --git a/backend/handler/metadata/ss_handler.py b/backend/handler/metadata/ss_handler.py
index c1646bd67..7d3715bf1 100644
--- a/backend/handler/metadata/ss_handler.py
+++ b/backend/handler/metadata/ss_handler.py
@@ -61,76 +61,7 @@ PS1_SS_ID: Final = 57
 PS2_SS_ID: Final = 58
 PSP_SS_ID: Final = 61
 SWITCH_SS_ID: Final = 225
-ARCADE_SS_IDS: Final = [
-    6,
-    7,
-    8,
-    47,
-    49,
-    52,
-    53,
-    54,
-    55,
-    56,
-    68,
-    69,
-    75,
-    112,
-    142,
-    147,
-    148,
-    149,
-    150,
-    151,
-    152,
-    153,
-    154,
-    155,
-    156,
-    157,
-    158,
-    159,
-    160,
-    161,
-    162,
-    163,
-    164,
-    165,
-    166,
-    167,
-    168,
-    169,
-    170,
-    173,
-    174,
-    175,
-    176,
-    177,
-    178,
-    179,
-    180,
-    181,
-    182,
-    183,
-    184,
-    185,
-    186,
-    187,
-    188,
-    189,
-    190,
-    191,
-    192,
-    193,
-    194,
-    195,
-    196,
-    209,
-    227,
-    130,
-    158,
-    269,
-]
+ARCADE_SS_ID: Final = 75
 
 # Regex to detect ScreenScraper ID tags in filenames like (ssfr-12345)
 SS_TAG_REGEX = re.compile(r"\(ssfr-(\d+)\)", re.IGNORECASE)
@@ -720,7 +651,7 @@ class SSHandler(MetadataHandler):
                 )
 
         # Support for MAME arcade filename format
-        if platform_ss_id in ARCADE_SS_IDS:
+        if platform_ss_id == ARCADE_SS_ID:
             search_term = await self._mame_format(search_term)
             fallback_rom = SSRom(ss_id=None, name=search_term)
 
@@ -805,6 +736,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.ANDROID: {"id": 63, "name": "Android"},
     UPS.APPLEII: {"id": 86, "name": "Apple II"},
     UPS.APPLE_IIGS: {"id": 51, "name": "Apple IIGS"},
+    UPS.ARCADE: {"id": ARCADE_SS_ID, "name": "Arcade"},
     UPS.ARCADIA_2001: {"id": 94, "name": "Arcadia 2001"},
     UPS.ARDUBOY: {"id": 263, "name": "Arduboy"},
     UPS.ATARI2600: {"id": 26, "name": "Atari 2600"},
@@ -882,7 +814,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.N64DD: {"id": 122, "name": "Nintendo 64DD"},
     UPS.NDS: {"id": 15, "name": "Nintendo DS"},
     UPS.NINTENDO_DSI: {"id": 15, "name": "Nintendo DS"},
-    UPS.SWITCH: {"id": 225, "name": "Switch"},
+    UPS.SWITCH: {"id": SWITCH_SS_ID, "name": "Switch"},
     UPS.ODYSSEY_2: {"id": 104, "name": "Videopac G7000"},
     UPS.OPENBOR: {"id": 214, "name": "OpenBOR"},
     UPS.ORIC: {"id": 131, "name": "Oric 1 / Atmos"},
@@ -891,11 +823,11 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.PC_FX: {"id": 72, "name": "PC-FX"},
     UPS.PICO: {"id": 234, "name": "Pico-8"},
     UPS.PSVITA: {"id": 62, "name": "PS Vita"},
-    UPS.PSP: {"id": 61, "name": "PSP"},
+    UPS.PSP: {"id": PSP_SS_ID, "name": "PSP"},
     UPS.PALM_OS: {"id": 219, "name": "Palm OS"},
     UPS.PHILIPS_VG_5000: {"id": 261, "name": "Philips VG 5000"},
-    UPS.PSX: {"id": 57, "name": "Playstation"},
-    UPS.PS2: {"id": 58, "name": "Playstation 2"},
+    UPS.PSX: {"id": PS1_SS_ID, "name": "Playstation"},
+    UPS.PS2: {"id": PS2_SS_ID, "name": "Playstation 2"},
     UPS.PS3: {"id": 59, "name": "Playstation 3"},
     UPS.PS4: {"id": 60, "name": "Playstation 4"},
     UPS.PS5: {"id": 284, "name": "Playstation 5"},

From dfd8840f970a75b80b49c3ab2de6b9c27139e509 Mon Sep 17 00:00:00 2001
From: Michon van Dooren <me@maienm.com>
Date: Mon, 29 Dec 2025 20:58:07 +0100
Subject: [PATCH 46/73] Improve join on platforms in queries on roms table

The old variant added subqueries that query the entire rom table which
were evaluated for each rom, absolutely tanking the performance on
larger collections.
---
 backend/handler/database/roms_handler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index bf6daa649..0b17cb07d 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -106,7 +106,7 @@ def with_details(func):
     def wrapper(*args, **kwargs):
         kwargs["query"] = select(Rom).options(
             # Ensure platform is loaded for main ROM objects
-            joinedload(Rom.platform),
+            selectinload(Rom.platform),
             selectinload(Rom.saves).options(
                 noload(Save.rom),
                 noload(Save.user),
@@ -138,7 +138,7 @@ def with_simple(func):
     def wrapper(*args, **kwargs):
         kwargs["query"] = select(Rom).options(
             # Ensure platform is loaded for main ROM objects
-            joinedload(Rom.platform),
+            selectinload(Rom.platform),
             # Display properties for the current user (last_played)
             selectinload(Rom.rom_users).options(noload(RomUser.rom)),
             # Sort table by metadata (first_release_date)

From d3b5f5a69cf9f04d8482ecb443b1a53a7da7e26b Mon Sep 17 00:00:00 2001
From: Zuko <zuczeq@gmail.com>
Date: Mon, 29 Dec 2025 21:40:29 +0100
Subject: [PATCH 47/73] Fix YAML indentation in netplay section of config
 example file

Corrected the  indentation for the netplay configuration within the config example file.
---
 examples/config.example.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/config.example.yml b/examples/config.example.yml
index 514029e0a..3d8c40fe8 100644
--- a/examples/config.example.yml
+++ b/examples/config.example.yml
@@ -146,13 +146,13 @@
 #       snes9x_region: ntsc
 #     default: # These settings apply to all cores
 #       fps: show
-# netplay:
-#   enabled: true
-#   ice_servers:
-#     - urls: "stun:stun.relay.metered.ca:80"
-#     - urls: "turn:global.relay.metered.ca:80"
-#       username: "<username>"
-#       credential: "<password>"
+#   netplay:
+#     enabled: true
+#     ice_servers:
+#       - urls: "stun:stun.relay.metered.ca:80"
+#       - urls: "turn:global.relay.metered.ca:80"
+#         username: "<username>"
+#         credential: "<password>"
 #   controls: # https://emulatorjs.org/docs4devs/control-mapping/
 #     snes9x:
 #       0: # Player 1

From 939306951578e2292d2e6ef03ab118b9cf53d82d Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Mon, 29 Dec 2025 16:53:27 -0500
Subject: [PATCH 48/73] [HOTFIX] Fix scrolling load more in gallery views

---
 frontend/src/components/Home/Collections.vue             | 2 +-
 frontend/src/views/Gallery/Collection/BaseCollection.vue | 2 +-
 frontend/src/views/Gallery/Platform.vue                  | 2 +-
 frontend/src/views/Gallery/Search.vue                    | 2 +-
 frontend/src/views/Settings/LibraryManagement.vue        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Home/Collections.vue b/frontend/src/components/Home/Collections.vue
index a15dc7a76..25bc5e8f8 100644
--- a/frontend/src/components/Home/Collections.vue
+++ b/frontend/src/components/Home/Collections.vue
@@ -30,7 +30,7 @@ function onHover(emitData: { isHovering: boolean; id: number }) {
   hoveringCollectionId.value = emitData.id;
 }
 
-const { y: documentY } = useScroll(document.body, { throttle: 100 });
+const { y: documentY } = useScroll(window, { throttle: 100 });
 
 // Watch for scroll changes and trigger the throttled function
 watch(documentY, () => {
diff --git a/frontend/src/views/Gallery/Collection/BaseCollection.vue b/frontend/src/views/Gallery/Collection/BaseCollection.vue
index 6f817acd0..730676561 100644
--- a/frontend/src/views/Gallery/Collection/BaseCollection.vue
+++ b/frontend/src/views/Gallery/Collection/BaseCollection.vue
@@ -136,7 +136,7 @@ function onGameTouchEnd() {
   clearTimeout(timeout);
 }
 
-const { y: documentY } = useScroll(document.body, { throttle: 500 });
+const { y: documentY } = useScroll(window, { throttle: 500 });
 
 watch(documentY, () => {
   clearTimeout(timeout);
diff --git a/frontend/src/views/Gallery/Platform.vue b/frontend/src/views/Gallery/Platform.vue
index d27bca20f..d42658717 100644
--- a/frontend/src/views/Gallery/Platform.vue
+++ b/frontend/src/views/Gallery/Platform.vue
@@ -116,7 +116,7 @@ function onGameTouchEnd() {
   clearTimeout(timeout);
 }
 
-const { y: documentY } = useScroll(document.body, { throttle: 500 });
+const { y: documentY } = useScroll(window, { throttle: 500 });
 
 watch(documentY, () => {
   clearTimeout(timeout);
diff --git a/frontend/src/views/Gallery/Search.vue b/frontend/src/views/Gallery/Search.vue
index f3908915d..26e3049af 100644
--- a/frontend/src/views/Gallery/Search.vue
+++ b/frontend/src/views/Gallery/Search.vue
@@ -114,7 +114,7 @@ function fetchRoms() {
     });
 }
 
-const { y: documentY } = useScroll(document.body, { throttle: 500 });
+const { y: documentY } = useScroll(window, { throttle: 500 });
 
 watch(documentY, () => {
   clearTimeout(timeout);
diff --git a/frontend/src/views/Settings/LibraryManagement.vue b/frontend/src/views/Settings/LibraryManagement.vue
index 88b0a1b34..aee58c1bc 100644
--- a/frontend/src/views/Settings/LibraryManagement.vue
+++ b/frontend/src/views/Settings/LibraryManagement.vue
@@ -161,7 +161,7 @@ function resetMissingRoms() {
   galleryFilterStore.resetFilters();
 }
 
-const { y: documentY } = useScroll(document.body, { throttle: 500 });
+const { y: documentY } = useScroll(window, { throttle: 500 });
 
 // Watch for tab changes and update URL
 watch(tab, (newTab) => {

From 44b6aca015046aecc3355ce9db794bf85238df35 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Mon, 29 Dec 2025 17:56:50 -0500
Subject: [PATCH 49/73] rename to windowy

---
 frontend/src/components/Home/Collections.vue             | 6 +++---
 frontend/src/views/Gallery/Collection/BaseCollection.vue | 9 ++++-----
 frontend/src/views/Gallery/Platform.vue                  | 9 ++++-----
 frontend/src/views/Gallery/Search.vue                    | 9 ++++-----
 frontend/src/views/Settings/LibraryManagement.vue        | 9 ++++-----
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/Home/Collections.vue b/frontend/src/components/Home/Collections.vue
index 25bc5e8f8..648a96cfd 100644
--- a/frontend/src/components/Home/Collections.vue
+++ b/frontend/src/components/Home/Collections.vue
@@ -30,12 +30,12 @@ function onHover(emitData: { isHovering: boolean; id: number }) {
   hoveringCollectionId.value = emitData.id;
 }
 
-const { y: documentY } = useScroll(window, { throttle: 100 });
+const { y: windowY } = useScroll(window, { throttle: 100 });
 
 // Watch for scroll changes and trigger the throttled function
-watch(documentY, () => {
+watch(windowY, () => {
   if (
-    documentY.value + window.innerHeight >= document.body.scrollHeight - 300 &&
+    windowY.value + window.innerHeight >= document.body.scrollHeight - 300 &&
     visibleCollections.value < props.collections.length
   ) {
     visibleCollections.value += 72;
diff --git a/frontend/src/views/Gallery/Collection/BaseCollection.vue b/frontend/src/views/Gallery/Collection/BaseCollection.vue
index 730676561..d535a0175 100644
--- a/frontend/src/views/Gallery/Collection/BaseCollection.vue
+++ b/frontend/src/views/Gallery/Collection/BaseCollection.vue
@@ -136,16 +136,15 @@ function onGameTouchEnd() {
   clearTimeout(timeout);
 }
 
-const { y: documentY } = useScroll(window, { throttle: 500 });
+const { y: windowY } = useScroll(window, { throttle: 500 });
 
-watch(documentY, () => {
+watch(windowY, () => {
   clearTimeout(timeout);
 
   window.setTimeout(async () => {
-    scrolledToTop.value = documentY.value === 0;
+    scrolledToTop.value = windowY.value === 0;
     if (
-      documentY.value + window.innerHeight >=
-        document.body.scrollHeight - 300 &&
+      windowY.value + window.innerHeight >= document.body.scrollHeight - 300 &&
       fetchTotalRoms.value > filteredRoms.value.length
     ) {
       await fetchRoms();
diff --git a/frontend/src/views/Gallery/Platform.vue b/frontend/src/views/Gallery/Platform.vue
index d42658717..9d8815842 100644
--- a/frontend/src/views/Gallery/Platform.vue
+++ b/frontend/src/views/Gallery/Platform.vue
@@ -116,16 +116,15 @@ function onGameTouchEnd() {
   clearTimeout(timeout);
 }
 
-const { y: documentY } = useScroll(window, { throttle: 500 });
+const { y: windowY } = useScroll(window, { throttle: 500 });
 
-watch(documentY, () => {
+watch(windowY, () => {
   clearTimeout(timeout);
 
   window.setTimeout(async () => {
-    scrolledToTop.value = documentY.value === 0;
+    scrolledToTop.value = windowY.value === 0;
     if (
-      documentY.value + window.innerHeight >=
-        document.body.scrollHeight - 300 &&
+      windowY.value + window.innerHeight >= document.body.scrollHeight - 300 &&
       fetchTotalRoms.value > filteredRoms.value.length
     ) {
       await fetchRoms();
diff --git a/frontend/src/views/Gallery/Search.vue b/frontend/src/views/Gallery/Search.vue
index 26e3049af..f2bb39a70 100644
--- a/frontend/src/views/Gallery/Search.vue
+++ b/frontend/src/views/Gallery/Search.vue
@@ -114,16 +114,15 @@ function fetchRoms() {
     });
 }
 
-const { y: documentY } = useScroll(window, { throttle: 500 });
+const { y: windowY } = useScroll(window, { throttle: 500 });
 
-watch(documentY, () => {
+watch(windowY, () => {
   clearTimeout(timeout);
 
   window.setTimeout(async () => {
-    scrolledToTop.value = documentY.value === 0;
+    scrolledToTop.value = windowY.value === 0;
     if (
-      documentY.value + window.innerHeight >=
-        document.body.scrollHeight - 300 &&
+      windowY.value + window.innerHeight >= document.body.scrollHeight - 300 &&
       fetchTotalRoms.value > filteredRoms.value.length
     ) {
       await fetchRoms();
diff --git a/frontend/src/views/Settings/LibraryManagement.vue b/frontend/src/views/Settings/LibraryManagement.vue
index aee58c1bc..a98df583b 100644
--- a/frontend/src/views/Settings/LibraryManagement.vue
+++ b/frontend/src/views/Settings/LibraryManagement.vue
@@ -161,7 +161,7 @@ function resetMissingRoms() {
   galleryFilterStore.resetFilters();
 }
 
-const { y: documentY } = useScroll(window, { throttle: 500 });
+const { y: windowY } = useScroll(window, { throttle: 500 });
 
 // Watch for tab changes and update URL
 watch(tab, (newTab) => {
@@ -185,14 +185,13 @@ watch(
   { immediate: true },
 );
 
-watch(documentY, () => {
+watch(windowY, () => {
   clearTimeout(timeout);
 
   window.setTimeout(async () => {
-    scrolledToTop.value = documentY.value === 0;
+    scrolledToTop.value = windowY.value === 0;
     if (
-      documentY.value + window.innerHeight >=
-        document.body.scrollHeight - 300 &&
+      windowY.value + window.innerHeight >= document.body.scrollHeight - 300 &&
       fetchTotalRoms.value > filteredRoms.value.length
     ) {
       await fetchRoms();

From 9ac37803b32588930f716bdd8f032bf2f02c6e9e Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 30 Dec 2025 10:42:51 +0000
Subject: [PATCH 50/73] Add has_notes flag and update note handling in ROM
 schemas and components

---
 backend/endpoints/responses/rom.py            |  11 ++
 backend/endpoints/rom.py                      |  17 ++-
 .../__generated__/models/SimpleRomSchema.ts   |   1 +
 .../src/components/common/Game/Card/Base.vue  |   8 +-
 .../common/Game/Dialog/NoteDialog.vue         | 112 ++++--------------
 .../components/common/Game/VirtualTable.vue   |  10 +-
 6 files changed, 55 insertions(+), 104 deletions(-)

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 5249f0cb8..0fb653fae 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -329,15 +329,26 @@ class SiblingRomSchema(BaseModel):
 
 
 class SimpleRomSchema(RomSchema):
+    has_notes: bool = False
+
     @classmethod
     def from_orm_with_request(cls, db_rom: Rom, request: Request) -> SimpleRomSchema:
+        from handler.database import db_rom_handler
+
+        user_id = request.user.id
         db_rom = cls.populate_properties(db_rom, request)
+
+        # Check if user has any notes for this ROM
+        notes = db_rom_handler.get_rom_notes(rom_id=db_rom.id, user_id=user_id)
+        db_rom.has_notes = len(notes) > 0  # type: ignore
+
         return cls.model_validate(db_rom)
 
     @classmethod
     def from_orm_with_factory(cls, db_rom: Rom) -> SimpleRomSchema:
         db_rom.rom_user = rom_user_schema_factory()  # type: ignore
         db_rom.siblings = []  # type: ignore
+        db_rom.has_notes = False  # type: ignore
         return cls.model_validate(db_rom)
 
 
diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 6997d0b7b..f6c84ca73 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -1483,7 +1483,22 @@ async def get_rom_notes(
         tags=tags,
     )
 
-    return [UserNoteSchema.model_validate(note) for note in notes]
+    result = []
+    for note in notes:
+        note_dict = {
+            "id": note.id,
+            "title": note.title,
+            "content": note.content,
+            "is_public": note.is_public,
+            "tags": note.tags,
+            "created_at": note.created_at,
+            "updated_at": note.updated_at,
+            "user_id": note.user_id,
+            "username": note.user.username,
+        }
+        result.append(UserNoteSchema.model_validate(note_dict))
+
+    return result
 
 
 @protected_route(
diff --git a/frontend/src/__generated__/models/SimpleRomSchema.ts b/frontend/src/__generated__/models/SimpleRomSchema.ts
index b55eb0970..2574a28aa 100644
--- a/frontend/src/__generated__/models/SimpleRomSchema.ts
+++ b/frontend/src/__generated__/models/SimpleRomSchema.ts
@@ -81,5 +81,6 @@ export type SimpleRomSchema = {
     rom_user: RomUserSchema;
     merged_screenshots: Array<string>;
     merged_ra_metadata: (RomRAMetadata | null);
+    has_notes?: boolean;
 };
 
diff --git a/frontend/src/components/common/Game/Card/Base.vue b/frontend/src/components/common/Game/Card/Base.vue
index 25d734988..04a6ebcba 100644
--- a/frontend/src/components/common/Game/Card/Base.vue
+++ b/frontend/src/components/common/Game/Card/Base.vue
@@ -154,12 +154,6 @@ const {
   forceBoxart: props.forceBoxart,
 });
 
-const hasNotes = computed(() => {
-  // TODO: Add note count to SimpleRom or check all_user_notes
-  // For now, return false until we implement proper note counting
-  return false;
-});
-
 const computedAspectRatio = computed(() => {
   return galleryViewStore.getAspectRatio({
     platformId: props.rom.platform_id,
@@ -389,7 +383,7 @@ onBeforeUnmount(() => {
                     <v-icon>mdi-star</v-icon>
                   </v-chip>
                   <v-chip
-                    v-if="hasNotes && showChips"
+                    v-if="rom.has_notes && showChips"
                     class="translucent text-white mr-1 mb-1 px-1"
                     density="compact"
                     title="View notes"
diff --git a/frontend/src/components/common/Game/Dialog/NoteDialog.vue b/frontend/src/components/common/Game/Dialog/NoteDialog.vue
index 97e46f37b..ac0975326 100644
--- a/frontend/src/components/common/Game/Dialog/NoteDialog.vue
+++ b/frontend/src/components/common/Game/Dialog/NoteDialog.vue
@@ -1,55 +1,52 @@
 <script setup lang="ts">
-import { MdPreview } from "md-editor-v3";
-import "md-editor-v3/lib/style.css";
 import type { Emitter } from "mitt";
-import { inject, ref, computed } from "vue";
+import { inject, ref } from "vue";
 import { useI18n } from "vue-i18n";
-import { useTheme } from "vuetify";
+import MultiNoteManager from "@/components/Details/MultiNoteManager.vue";
 import RDialog from "@/components/common/RDialog.vue";
 import romApi from "@/services/api/rom";
-import type { SimpleRom } from "@/stores/roms";
+import type { DetailedRom } from "@/stores/roms";
 import type { Events } from "@/types/emitter";
-import { toBrowserLocale } from "@/utils";
 
-const theme = useTheme();
 const emitter = inject<Emitter<Events>>("emitter");
-const { t, locale } = useI18n();
+const { t } = useI18n();
 
-const rom = ref<SimpleRom | null>(null);
+const rom = ref<DetailedRom | null>(null);
 const show = ref(false);
-const notes = ref<any[]>([]);
 const loading = ref(false);
 
-// Computed to get current user notes
-const currentUserNotes = computed(() => {
-  return notes.value
-    .filter((note) => note.user_id === rom.value?.rom_user?.user_id)
-    .sort((a, b) => a.title.localeCompare(b.title));
-});
-
 emitter?.on("showNoteDialog", async (romToShow) => {
-  rom.value = romToShow;
   show.value = true;
+  loading.value = true;
 
-  // Fetch notes for this ROM
   if (romToShow.id) {
-    loading.value = true;
     try {
-      const response = await romApi.getRomNotes({ romId: romToShow.id });
-      notes.value = response.data;
+      const response = await romApi.getRom({ romId: romToShow.id });
+      rom.value = response.data;
     } catch (error) {
-      console.error("Failed to fetch notes:", error);
-      notes.value = [];
+      console.error("Failed to fetch ROM details:", error);
+      rom.value = null;
     } finally {
       loading.value = false;
     }
   }
 });
 
+async function onNotesUpdated() {
+  if (rom.value?.id) {
+    try {
+      const updatedRom = await romApi.getRom({ romId: rom.value.id });
+      // Update the rom with the new data
+      Object.assign(rom.value, updatedRom.data);
+    } catch (error) {
+      console.error("Failed to refetch ROM data:", error);
+    }
+  }
+}
+
 function closeDialog() {
   show.value = false;
   rom.value = null;
-  notes.value = [];
 }
 </script>
 
@@ -68,69 +65,8 @@ function closeDialog() {
       </v-toolbar-title>
     </template>
     <template #content>
-      <div class="pa-4">
-        <div v-if="loading" class="text-center py-8">
-          <v-progress-circular indeterminate color="primary" />
-          <p class="text-body-2 mt-2">{{ t("common.loading") }}...</p>
-        </div>
-        <div v-else-if="currentUserNotes.length > 0">
-          <v-expansion-panels multiple flat variant="accordion">
-            <v-expansion-panel
-              v-for="note in currentUserNotes"
-              :key="note.title"
-              :value="note.title"
-              rounded="0"
-            >
-              <v-expansion-panel-title class="bg-toplayer">
-                <div class="d-flex justify-space-between align-center w-100">
-                  <span class="text-body-1">{{ note.title }}</span>
-                  <div class="d-flex gap-2 align-center mr-4">
-                    <v-chip
-                      :color="note.is_public ? 'success' : 'warning'"
-                      variant="text"
-                      class="mr-2"
-                    >
-                      <v-icon>
-                        {{
-                          note.is_public ? "mdi-lock-open-variant" : "mdi-lock"
-                        }}
-                      </v-icon>
-                    </v-chip>
-                  </div>
-                </div>
-              </v-expansion-panel-title>
-              <v-expansion-panel-text class="bg-surface">
-                <MdPreview
-                  no-highlight
-                  no-katex
-                  no-mermaid
-                  :model-value="note.content"
-                  :theme="theme.global.name.value === 'dark' ? 'dark' : 'light'"
-                  language="en-US"
-                  preview-theme="vuepress"
-                  code-theme="github"
-                  class="py-4 px-6"
-                />
-                <v-card-subtitle
-                  v-if="note.updated_at"
-                  class="text-caption mt-2 mb-2"
-                >
-                  {{ t("common.last-updated") }}:
-                  {{
-                    new Date(note.updated_at).toLocaleString(
-                      toBrowserLocale(locale),
-                    )
-                  }}
-                </v-card-subtitle>
-              </v-expansion-panel-text>
-            </v-expansion-panel>
-          </v-expansion-panels>
-        </div>
-        <div v-else class="text-center py-8">
-          <v-icon color="grey" size="64">mdi-note-text-outline</v-icon>
-          <p class="text-h6 text-grey mt-4 mb-2">{{ t("rom.no-notes") }}</p>
-          <p class="text-body-2 text-grey">{{ t("rom.no-notes-desc") }}</p>
-        </div>
+      <div class="pa-2">
+        <MultiNoteManager :rom="rom" @notes-updated="onNotesUpdated" />
       </div>
     </template>
   </RDialog>
diff --git a/frontend/src/components/common/Game/VirtualTable.vue b/frontend/src/components/common/Game/VirtualTable.vue
index 07796d57c..334e96f45 100644
--- a/frontend/src/components/common/Game/VirtualTable.vue
+++ b/frontend/src/components/common/Game/VirtualTable.vue
@@ -99,12 +99,6 @@ const HEADERS = [
 
 const selectedRomIDs = computed(() => selectedRoms.value.map((rom) => rom.id));
 
-function hasNotes(item: SimpleRom): boolean {
-  // TODO: Add note count to SimpleRom or check all_user_notes
-  // For now, return false until we implement proper note counting
-  return false;
-}
-
 function showNoteDialog(event: MouseEvent | KeyboardEvent, item: SimpleRom) {
   event.preventDefault();
   emitter?.emit("showNoteDialog", item);
@@ -312,7 +306,7 @@ function updateOptions({ sortBy }: { sortBy: SortBy }) {
                 <v-icon>mdi-card-multiple-outline</v-icon>
               </v-chip>
               <v-chip
-                v-if="hasNotes(item)"
+                v-if="item.has_notes"
                 class="translucent text-white mr-1 px-1"
                 chip
                 size="x-small"
@@ -326,7 +320,7 @@ function updateOptions({ sortBy }: { sortBy: SortBy }) {
                 :text="`Missing from filesystem: ${item.fs_path}/${item.fs_name}`"
                 class="mr-1 px-1 item-chip"
                 chip
-                chip-size="x-small"
+                chip-size="small"
               />
             </template>
           </v-list-item>

From 45d5d0e78c00b4499dc5ce2ee155a59ff60a6d68 Mon Sep 17 00:00:00 2001
From: Zurdi <34356590+zurdi15@users.noreply.github.com>
Date: Tue, 30 Dec 2025 11:48:00 +0100
Subject: [PATCH 51/73] Update backend/endpoints/rom.py

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 backend/endpoints/rom.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index f6c84ca73..5b40629b9 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -1483,9 +1483,8 @@ async def get_rom_notes(
         tags=tags,
     )
 
-    result = []
-    for note in notes:
-        note_dict = {
+    return [
+        UserNoteSchema.model_validate({
             "id": note.id,
             "title": note.title,
             "content": note.content,
@@ -1495,10 +1494,9 @@ async def get_rom_notes(
             "updated_at": note.updated_at,
             "user_id": note.user_id,
             "username": note.user.username,
-        }
-        result.append(UserNoteSchema.model_validate(note_dict))
-
-    return result
+        })
+        for note in notes
+    ]
 
 
 @protected_route(

From 500d2b6954d4e2d19b8b895a11e759ffb7dcecf1 Mon Sep 17 00:00:00 2001
From: Zurdi <34356590+zurdi15@users.noreply.github.com>
Date: Tue, 30 Dec 2025 11:49:14 +0100
Subject: [PATCH 52/73] Update
 frontend/src/__generated__/models/SimpleRomSchema.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 frontend/src/__generated__/models/SimpleRomSchema.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/__generated__/models/SimpleRomSchema.ts b/frontend/src/__generated__/models/SimpleRomSchema.ts
index 2574a28aa..15b349e21 100644
--- a/frontend/src/__generated__/models/SimpleRomSchema.ts
+++ b/frontend/src/__generated__/models/SimpleRomSchema.ts
@@ -81,6 +81,6 @@ export type SimpleRomSchema = {
     rom_user: RomUserSchema;
     merged_screenshots: Array<string>;
     merged_ra_metadata: (RomRAMetadata | null);
-    has_notes?: boolean;
+    has_notes: boolean;
 };
 

From 65efa5856fa0ce714efbe51d2ea572f981da6ab9 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 30 Dec 2025 11:08:02 +0000
Subject: [PATCH 53/73] Refactor has_notes calculation and optimize note
 loading in ROM handling

---
 backend/endpoints/responses/rom.py                    | 11 ++++++-----
 backend/handler/database/roms_handler.py              |  2 ++
 .../src/components/common/Game/Dialog/NoteDialog.vue  |  4 ----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index 0fb653fae..ad65dacd2 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -333,14 +333,15 @@ class SimpleRomSchema(RomSchema):
 
     @classmethod
     def from_orm_with_request(cls, db_rom: Rom, request: Request) -> SimpleRomSchema:
-        from handler.database import db_rom_handler
-
         user_id = request.user.id
         db_rom = cls.populate_properties(db_rom, request)
 
-        # Check if user has any notes for this ROM
-        notes = db_rom_handler.get_rom_notes(rom_id=db_rom.id, user_id=user_id)
-        db_rom.has_notes = len(notes) > 0  # type: ignore
+        # Calculate has_notes from already-loaded notes relationship
+        # Check if there are any notes for this ROM (public or user's own)
+        notes = getattr(db_rom, "notes", [])
+        db_rom.has_notes = any(  # type: ignore
+            note.is_public or note.user_id == user_id for note in notes
+        )
 
         return cls.model_validate(db_rom)
 
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 0b17cb07d..2d20e4b01 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -151,6 +151,8 @@ def with_simple(func):
             selectinload(Rom.sibling_roms).options(
                 noload(Rom.platform), noload(Rom.metadatum)
             ),
+            # Load notes to avoid N+1 queries when checking for has_notes
+            selectinload(Rom.notes),
         )
         return func(*args, **kwargs)
 
diff --git a/frontend/src/components/common/Game/Dialog/NoteDialog.vue b/frontend/src/components/common/Game/Dialog/NoteDialog.vue
index ac0975326..5031499ae 100644
--- a/frontend/src/components/common/Game/Dialog/NoteDialog.vue
+++ b/frontend/src/components/common/Game/Dialog/NoteDialog.vue
@@ -13,11 +13,9 @@ const { t } = useI18n();
 
 const rom = ref<DetailedRom | null>(null);
 const show = ref(false);
-const loading = ref(false);
 
 emitter?.on("showNoteDialog", async (romToShow) => {
   show.value = true;
-  loading.value = true;
 
   if (romToShow.id) {
     try {
@@ -26,8 +24,6 @@ emitter?.on("showNoteDialog", async (romToShow) => {
     } catch (error) {
       console.error("Failed to fetch ROM details:", error);
       rom.value = null;
-    } finally {
-      loading.value = false;
     }
   }
 });

From b2c6590e82cd541448f557960d81c58cff91dff2 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 30 Dec 2025 11:08:27 +0000
Subject: [PATCH 54/73] Merge remote-tracking branch 'origin/fix/notes-flag'

---
 frontend/src/__generated__/models/SimpleRomSchema.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/__generated__/models/SimpleRomSchema.ts b/frontend/src/__generated__/models/SimpleRomSchema.ts
index 2574a28aa..15b349e21 100644
--- a/frontend/src/__generated__/models/SimpleRomSchema.ts
+++ b/frontend/src/__generated__/models/SimpleRomSchema.ts
@@ -81,6 +81,6 @@ export type SimpleRomSchema = {
     rom_user: RomUserSchema;
     merged_screenshots: Array<string>;
     merged_ra_metadata: (RomRAMetadata | null);
-    has_notes?: boolean;
+    has_notes: boolean;
 };
 

From 2c3397893f13a061883b940029eeab8afba85f20 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 30 Dec 2025 11:12:32 +0000
Subject: [PATCH 55/73] Refactor note retrieval in get_rom_notes and update
 comment for notes loading in roms_handler

---
 backend/endpoints/rom.py                 | 15 +--------------
 backend/handler/database/roms_handler.py |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 5b40629b9..6997d0b7b 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -1483,20 +1483,7 @@ async def get_rom_notes(
         tags=tags,
     )
 
-    return [
-        UserNoteSchema.model_validate({
-            "id": note.id,
-            "title": note.title,
-            "content": note.content,
-            "is_public": note.is_public,
-            "tags": note.tags,
-            "created_at": note.created_at,
-            "updated_at": note.updated_at,
-            "user_id": note.user_id,
-            "username": note.user.username,
-        })
-        for note in notes
-    ]
+    return [UserNoteSchema.model_validate(note) for note in notes]
 
 
 @protected_route(
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 2d20e4b01..5f20a6a7d 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -151,7 +151,7 @@ def with_simple(func):
             selectinload(Rom.sibling_roms).options(
                 noload(Rom.platform), noload(Rom.metadatum)
             ),
-            # Load notes to avoid N+1 queries when checking for has_notes
+            # Show notes indicator on cards
             selectinload(Rom.notes),
         )
         return func(*args, **kwargs)

From a7bda9859afaeac16c90e5fe12e9a1a69fa75fd2 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 30 Dec 2025 11:19:47 +0000
Subject: [PATCH 56/73] Make has_notes optional in SimpleRomSchema type
 definition

---
 frontend/src/__generated__/models/SimpleRomSchema.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/__generated__/models/SimpleRomSchema.ts b/frontend/src/__generated__/models/SimpleRomSchema.ts
index 15b349e21..2574a28aa 100644
--- a/frontend/src/__generated__/models/SimpleRomSchema.ts
+++ b/frontend/src/__generated__/models/SimpleRomSchema.ts
@@ -81,6 +81,6 @@ export type SimpleRomSchema = {
     rom_user: RomUserSchema;
     merged_screenshots: Array<string>;
     merged_ra_metadata: (RomRAMetadata | null);
-    has_notes: boolean;
+    has_notes?: boolean;
 };
 

From 647e99fca73ee5ca4d65d6e71ad4388ba7a237ac Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Tue, 30 Dec 2025 12:53:12 +0000
Subject: [PATCH 57/73] Add last played filter to ROMs retrieval and update
 related tests

---
 backend/endpoints/rom.py                 |  7 +++++
 backend/handler/database/roms_handler.py | 19 +++++++++++++
 backend/tests/handler/test_db_handler.py | 35 ++++++++++++++++++++++++
 frontend/src/services/api/rom.ts         |  1 +
 frontend/src/services/cache/api.ts       |  2 ++
 5 files changed, 64 insertions(+)

diff --git a/backend/endpoints/rom.py b/backend/endpoints/rom.py
index 5121eb469..0311ccc1b 100644
--- a/backend/endpoints/rom.py
+++ b/backend/endpoints/rom.py
@@ -233,6 +233,12 @@ def get_roms(
         bool | None,
         Query(description="Whether the rom is marked as duplicate."),
     ] = None,
+    last_played: Annotated[
+        bool | None,
+        Query(
+            description="Whether the rom has a last played value for the current user."
+        ),
+    ] = None,
     playable: Annotated[
         bool | None,
         Query(description="Whether the rom is playable from the browser."),
@@ -404,6 +410,7 @@ def get_roms(
         matched=matched,
         favorite=favorite,
         duplicate=duplicate,
+        last_played=last_played,
         playable=playable,
         has_ra=has_ra,
         missing=missing,
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 6ec943e00..e465f5ce2 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -311,6 +311,18 @@ class DBRomsHandler(DBBaseHandler):
             predicate = not_(predicate)
         return query.join(Platform).filter(predicate)
 
+    def filter_by_last_played(
+        self, query: Query, value: bool, user_id: int | None = None
+    ) -> Query:
+        """Filter based on whether the rom has a last played value for the user."""
+        if not user_id:
+            return query
+
+        predicate = RomUser.last_played.isnot(None)
+        if not value:
+            predicate = RomUser.last_played.is_(None)
+        return query.filter(predicate)
+
     def filter_by_has_ra(self, query: Query, value: bool) -> Query:
         predicate = Rom.ra_id.isnot(None)
         if not value:
@@ -457,6 +469,7 @@ class DBRomsHandler(DBBaseHandler):
         matched: bool | None = None,
         favorite: bool | None = None,
         duplicate: bool | None = None,
+        last_played: bool | None = None,
         playable: bool | None = None,
         has_ra: bool | None = None,
         missing: bool | None = None,
@@ -515,6 +528,11 @@ class DBRomsHandler(DBBaseHandler):
         if duplicate is not None:
             query = self.filter_by_duplicate(query, value=duplicate)
 
+        if last_played is not None:
+            query = self.filter_by_last_played(
+                query, value=last_played, user_id=user_id
+            )
+
         if playable is not None:
             query = self.filter_by_playable(query, value=playable)
 
@@ -730,6 +748,7 @@ class DBRomsHandler(DBBaseHandler):
             matched=kwargs.get("matched", None),
             favorite=kwargs.get("favorite", None),
             duplicate=kwargs.get("duplicate", None),
+            last_played=kwargs.get("last_played", None),
             playable=kwargs.get("playable", None),
             has_ra=kwargs.get("has_ra", None),
             missing=kwargs.get("missing", None),
diff --git a/backend/tests/handler/test_db_handler.py b/backend/tests/handler/test_db_handler.py
index e71002b01..0f373d525 100644
--- a/backend/tests/handler/test_db_handler.py
+++ b/backend/tests/handler/test_db_handler.py
@@ -1,3 +1,5 @@
+from datetime import datetime, timezone
+
 from sqlalchemy.exc import IntegrityError
 
 from handler.auth import auth_handler
@@ -70,6 +72,39 @@ def test_roms(rom: Rom, platform: Platform):
     assert len(roms) == 1
 
 
+def test_filter_last_played(rom: Rom, platform: Platform, admin_user: User):
+    second_rom = db_rom_handler.add_rom(
+        Rom(
+            platform_id=platform.id,
+            name="test_rom_unplayed",
+            slug="test_rom_unplayed_slug",
+            fs_name="test_rom_unplayed.zip",
+            fs_name_no_tags="test_rom_unplayed",
+            fs_name_no_ext="test_rom_unplayed",
+            fs_extension="zip",
+            fs_path=f"{platform.slug}/roms",
+        )
+    )
+    db_rom_handler.add_rom_user(rom_id=second_rom.id, user_id=admin_user.id)
+
+    rom_user = db_rom_handler.get_rom_user(rom.id, admin_user.id)
+    assert rom_user is not None
+
+    db_rom_handler.update_rom_user(
+        rom_user.id, {"last_played": datetime(2024, 1, 1, tzinfo=timezone.utc)}
+    )
+
+    played_roms = db_rom_handler.get_roms_scalar(
+        user_id=admin_user.id, last_played=True
+    )
+    assert {r.id for r in played_roms} == {rom.id}
+
+    unplayed_roms = db_rom_handler.get_roms_scalar(
+        user_id=admin_user.id, last_played=False
+    )
+    assert {r.id for r in unplayed_roms} == {second_rom.id}
+
+
 def test_users(admin_user):
     db_user_handler.add_user(
         User(
diff --git a/frontend/src/services/api/rom.ts b/frontend/src/services/api/rom.ts
index e6c63634f..4e5618877 100644
--- a/frontend/src/services/api/rom.ts
+++ b/frontend/src/services/api/rom.ts
@@ -244,6 +244,7 @@ async function getRecentPlayedRoms(): Promise<{ data: GetRomsResponse }> {
       order_dir: "desc",
       limit: RECENT_PLAYED_ROMS_LIMIT,
       with_char_index: false,
+      last_played: true,
     },
   });
 }
diff --git a/frontend/src/services/cache/api.ts b/frontend/src/services/cache/api.ts
index f68ce171b..8138b17ed 100644
--- a/frontend/src/services/cache/api.ts
+++ b/frontend/src/services/cache/api.ts
@@ -152,6 +152,7 @@ class CachedApiService {
       order_dir: "desc",
       limit: 15,
       with_char_index: false,
+      last_played: true,
     });
 
     return cacheService.request<GetRomsResponse>(config, onBackgroundUpdate);
@@ -177,6 +178,7 @@ class CachedApiService {
       order_dir: "desc",
       limit: 15,
       with_char_index: false,
+      last_played: true,
     });
   }
 

From 0971026f957aba18eafb3b04335bfbaaf24f7059 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 11:37:06 -0500
Subject: [PATCH 58/73] Add support for version tag

---
 .../alembic/versions/0059_rom_version_tag.py  |  27 +++++
 backend/endpoints/sockets/scan.py             |  13 +--
 backend/handler/filesystem/roms_handler.py    |  94 ++++++++++------
 backend/models/rom.py                         |   1 +
 backend/tests/conftest.py                     |  80 ++++++++++++-
 .../handler/filesystem/test_roms_handler.py   | 106 +++++++++++-------
 6 files changed, 239 insertions(+), 82 deletions(-)
 create mode 100644 backend/alembic/versions/0059_rom_version_tag.py

diff --git a/backend/alembic/versions/0059_rom_version_tag.py b/backend/alembic/versions/0059_rom_version_tag.py
new file mode 100644
index 000000000..1ffda8aea
--- /dev/null
+++ b/backend/alembic/versions/0059_rom_version_tag.py
@@ -0,0 +1,27 @@
+"""empty message
+
+Revision ID: 0059_rom_version_tag
+Revises: 0058_roms_metadata_launchbox
+Create Date: 2025-12-30 10:48:45.025990
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = "0059_rom_version_tag"
+down_revision = "0058_roms_metadata_launchbox"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("roms", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("version", sa.String(length=100), nullable=True))
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("roms", schema=None) as batch_op:
+        batch_op.drop_column("version")
diff --git a/backend/endpoints/sockets/scan.py b/backend/endpoints/sockets/scan.py
index a027a726a..b9f013d4f 100644
--- a/backend/endpoints/sockets/scan.py
+++ b/backend/endpoints/sockets/scan.py
@@ -253,9 +253,7 @@ async def _identify_rom(
         return
 
     # Update properties that don't require metadata
-    fs_regions, fs_revisions, fs_languages, fs_other_tags = fs_rom_handler.parse_tags(
-        fs_rom["fs_name"]
-    )
+    parsed_tags = fs_rom_handler.parse_tags(fs_rom["fs_name"])
     roms_path = fs_rom_handler.get_roms_fs_structure(platform.fs_slug)
 
     # Create the entry early so we have the ID
@@ -272,10 +270,11 @@ async def _identify_rom(
                     fs_rom["fs_name"]
                 ),
                 fs_extension=fs_rom_handler.parse_file_extension(fs_rom["fs_name"]),
-                regions=fs_regions,
-                revision=fs_revisions,
-                languages=fs_languages,
-                tags=fs_other_tags,
+                regions=parsed_tags.regions,
+                revision=parsed_tags.revision,
+                version=parsed_tags.version,
+                languages=parsed_tags.languages,
+                tags=parsed_tags.other_tags,
                 platform_id=platform.id,
                 name=fs_rom["fs_name"],
                 url_cover="",
diff --git a/backend/handler/filesystem/roms_handler.py b/backend/handler/filesystem/roms_handler.py
index 2eca5fee5..998fe4f07 100644
--- a/backend/handler/filesystem/roms_handler.py
+++ b/backend/handler/filesystem/roms_handler.py
@@ -8,6 +8,7 @@ import tarfile
 import zipfile
 import zlib
 from collections.abc import Callable, Iterator
+from dataclasses import dataclass
 from pathlib import Path
 from typing import IO, Any, Final, Literal, TypedDict, cast
 
@@ -288,6 +289,19 @@ DEFAULT_CRC_C = 0
 DEFAULT_MD5_H_DIGEST = hashlib.md5(usedforsecurity=False).digest()
 DEFAULT_SHA1_H_DIGEST = hashlib.sha1(usedforsecurity=False).digest()
 
+VERSION_TAG_REGEX = re.compile(r"^(?:version|ver|v)[\s_-]?(.*)", re.I)
+REGION_TAG_REGEX = re.compile(r"^reg[\s|-](.*)$", re.I)
+REVISION_TAG_REGEX = re.compile(r"^rev[\s|-](.*)$", re.I)
+
+
+@dataclass(frozen=True)
+class ParsedTags:
+    version: str
+    revision: str
+    regions: list[str]
+    languages: list[str]
+    other_tags: list[str]
+
 
 class FSRomsHandler(FSHandler):
     def __init__(self) -> None:
@@ -301,50 +315,64 @@ class FSRomsHandler(FSHandler):
             else f"{fs_slug}/{cnfg.ROMS_FOLDER_NAME}"
         )
 
-    def parse_tags(self, fs_name: str) -> tuple:
-        rev = ""
-        regs = []
-        langs = []
-        other_tags = []
-        tags = [tag[0] or tag[1] for tag in TAG_REGEX.findall(fs_name)]
-        tags = [tag for subtags in tags for tag in subtags.split(",")]
-        tags = [tag.strip() for tag in tags]
+    def parse_tags(self, fs_name: str) -> ParsedTags:
+        tags = [
+            chunk.strip()
+            for tag in (m[0] or m[1] for m in TAG_REGEX.findall(fs_name))
+            for chunk in tag.split(",")
+        ]
 
-        for tag in tags:
-            if tag.lower() in REGIONS_BY_SHORTCODE.keys():
-                regs.append(REGIONS_BY_SHORTCODE[tag.lower()])
+        regions, languages, other_tags = [], [], []
+        version = revision = ""
+
+        for raw in tags:
+            tag = raw.lower()
+
+            # Region by code
+            if tag in REGIONS_BY_SHORTCODE.keys():
+                regions.append(REGIONS_BY_SHORTCODE[tag])
+                continue
+            if tag in REGIONS_NAME_KEYS:
+                regions.append(raw)
                 continue
 
-            if tag.lower() in REGIONS_NAME_KEYS:
-                regs.append(tag)
+            # Language by code
+            if tag in LANGUAGES_BY_SHORTCODE.keys():
+                languages.append(LANGUAGES_BY_SHORTCODE[tag])
+                continue
+            if tag in LANGUAGES_NAME_KEYS:
+                languages.append(raw)
                 continue
 
-            if tag.lower() in LANGUAGES_BY_SHORTCODE.keys():
-                langs.append(LANGUAGES_BY_SHORTCODE[tag.lower()])
+            # Version
+            version_match = VERSION_TAG_REGEX.match(raw)
+            if version_match:
+                version = version_match[1]
                 continue
 
-            if tag.lower() in LANGUAGES_NAME_KEYS:
-                langs.append(tag)
+            # Region prefix
+            region_match = REGION_TAG_REGEX.match(raw)
+            if region_match:
+                key = region_match[1].lower()
+                regions.append(REGIONS_BY_SHORTCODE.get(key, region_match[1]))
                 continue
 
-            if "reg" in tag.lower():
-                match = re.match(r"^reg[\s|-](.*)$", tag, re.IGNORECASE)
-                if match:
-                    regs.append(
-                        REGIONS_BY_SHORTCODE[match.group(1).lower()]
-                        if match.group(1).lower() in REGIONS_BY_SHORTCODE.keys()
-                        else match.group(1)
-                    )
-                    continue
+            # Revision prefix
+            revision_match = REVISION_TAG_REGEX.match(raw)
+            if revision_match:
+                revision = revision_match[1]
+                continue
 
-            if "rev" in tag.lower():
-                match = re.match(r"^rev[\s|-](.*)$", tag, re.IGNORECASE)
-                if match:
-                    rev = match.group(1)
-                    continue
+            # Anything else
+            other_tags.append(raw)
 
-            other_tags.append(tag)
-        return regs, rev, langs, other_tags
+        return ParsedTags(
+            version=version,
+            regions=regions,
+            languages=languages,
+            revision=revision,
+            other_tags=other_tags,
+        )
 
     def exclude_multi_roms(self, roms: list[str]) -> list[str]:
         excluded_names = cm.get_config().EXCLUDED_MULTI_FILES
diff --git a/backend/models/rom.py b/backend/models/rom.py
index 3ff7d9676..11021708a 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -227,6 +227,7 @@ class Rom(BaseModel):
     )
 
     revision: Mapped[str | None] = mapped_column(String(length=100))
+    version: Mapped[str | None] = mapped_column(String(length=100))
     regions: Mapped[list[str] | None] = mapped_column(CustomJSON(), default=[])
     languages: Mapped[list[str] | None] = mapped_column(CustomJSON(), default=[])
     tags: Mapped[list[str] | None] = mapped_column(CustomJSON(), default=[])
diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py
index b2762387a..0a738ddeb 100644
--- a/backend/tests/conftest.py
+++ b/backend/tests/conftest.py
@@ -1,3 +1,7 @@
+import os
+import shutil
+from pathlib import Path
+
 import alembic.config
 import pytest
 from sqlalchemy import create_engine
@@ -23,8 +27,80 @@ session = sessionmaker(bind=engine, expire_on_commit=False)
 
 
 @pytest.fixture(scope="session", autouse=True)
-def setup_database():
-    alembic.config.main(argv=["upgrade", "head"])
+def setup_database(request):
+    original_cwd = os.getcwd()
+    try:
+        os.chdir(
+            os.path.join(os.path.dirname(__file__), "..")
+        )  # Change to backend directory
+        alembic.config.main(argv=["-c", "alembic.ini", "upgrade", "head"])
+    finally:
+        os.chdir(original_cwd)  # Restore original cwd
+
+    # Setup dummy library files for tests
+    library_base_path = Path(os.getcwd()) / "romm_test" / "library"
+
+    # Create necessary directories
+    (library_base_path / "n64" / "roms").mkdir(parents=True, exist_ok=True)
+    (library_base_path / "psx" / "roms").mkdir(parents=True, exist_ok=True)
+    (library_base_path / "n64" / "roms" / "Super Mario 64 (J) (Rev A)").mkdir(
+        parents=True, exist_ok=True
+    )
+    (library_base_path / "n64" / "roms" / "Test Multi Rom [USA]").mkdir(
+        parents=True, exist_ok=True
+    )
+    (library_base_path / "n64" / "roms" / "Sonic (EU) [T]" / "translation").mkdir(
+        parents=True, exist_ok=True
+    )
+
+    # Create dummy files
+    (library_base_path / "n64" / "roms" / "Paper Mario (USA).z64").write_bytes(
+        b"Paper Mario content"
+    )
+    (
+        library_base_path / "n64" / "roms" / "Zelda (USA) (Rev 1) [En,Fr] [Test].n64"
+    ).write_bytes(b"Zelda content")
+    (library_base_path / "n64" / "roms" / "test_game.n64").write_bytes(b"Test N64 ROM")
+    (library_base_path / "n64" / "roms" / "hash_test.n64").write_bytes(
+        b"Test ROM content for hashing"
+    )
+    (library_base_path / "n64" / "roms" / "excluded_test.tmp").write_bytes(
+        b"Excluded content"
+    )
+    (library_base_path / "psx" / "roms" / "PaRappa the Rapper.zip").write_bytes(
+        b"Zip content"
+    )
+    (
+        library_base_path
+        / "n64"
+        / "roms"
+        / "Super Mario 64 (J) (Rev A)"
+        / "Super Mario 64 (J) (Rev A) [Part 1].z64"
+    ).write_bytes(b"Part 1 content")
+    (
+        library_base_path
+        / "n64"
+        / "roms"
+        / "Super Mario 64 (J) (Rev A)"
+        / "Super Mario 64 (J) (Rev A) [Part 2].z64"
+    ).write_bytes(b"Part 2 content")
+    (
+        library_base_path / "n64" / "roms" / "Sonic (EU) [T]" / "Sonic (EU) [T].n64"
+    ).write_bytes(b"Sonic content")
+    (
+        library_base_path
+        / "n64"
+        / "roms"
+        / "Sonic (EU) [T]"
+        / "translation"
+        / "Sonic (EU) [T-En].z64"
+    ).write_bytes(b"Sonic translation content")
+
+    # Clean up dummy files after tests are done
+    def teardown_dummy_files():
+        shutil.rmtree(library_base_path, ignore_errors=True)
+
+    request.addfinalizer(teardown_dummy_files)
 
 
 @pytest.fixture(autouse=True)
diff --git a/backend/tests/handler/filesystem/test_roms_handler.py b/backend/tests/handler/filesystem/test_roms_handler.py
index a5633f4e5..7599f43ec 100644
--- a/backend/tests/handler/filesystem/test_roms_handler.py
+++ b/backend/tests/handler/filesystem/test_roms_handler.py
@@ -157,40 +157,69 @@ class TestFSRomsHandler:
         """Test parse_tags method with regions and languages"""
         fs_name = "Zelda (USA) (Rev 1) [En,Fr] [Test].n64"
 
-        regions, revision, languages, other_tags = handler.parse_tags(fs_name)
+        parsed_tags = handler.parse_tags(fs_name)
 
-        assert "USA" in regions
-        assert revision == "1"
-        assert "English" in languages
-        assert "French" in languages
-        assert "Test" in other_tags
+        assert "USA" in parsed_tags.regions
+        assert parsed_tags.revision == "1"
+        assert parsed_tags.version == ""
+        assert "English" in parsed_tags.languages
+        assert "French" in parsed_tags.languages
+        assert "Test" in parsed_tags.other_tags
 
     def test_parse_tags_complex_tags(self, handler: FSRomsHandler):
         """Test parse_tags with complex tag structures"""
         fs_name = "Game (Europe) (En,De,Fr,Es,It) (Rev A) [Reg-PAL] [Beta].rom"
 
-        regions, revision, languages, other_tags = handler.parse_tags(fs_name)
+        parsed_tags = handler.parse_tags(fs_name)
 
-        assert "Europe" in regions
-        assert "PAL" in regions
-        assert revision == "A"
-        assert "English" in languages
-        assert "German" in languages
-        assert "French" in languages
-        assert "Spanish" in languages
-        assert "Italian" in languages
-        assert "Beta" in other_tags
+        assert "Europe" in parsed_tags.regions
+        assert "PAL" in parsed_tags.regions
+        assert parsed_tags.revision == "A"
+        assert parsed_tags.version == ""
+        assert "English" in parsed_tags.languages
+        assert "German" in parsed_tags.languages
+        assert "French" in parsed_tags.languages
+        assert "Spanish" in parsed_tags.languages
+        assert "Italian" in parsed_tags.languages
+        assert "Beta" in parsed_tags.other_tags
 
     def test_parse_tags_no_tags(self, handler: FSRomsHandler):
         """Test parse_tags with no tags"""
         fs_name = "Simple Game.rom"
 
-        regions, revision, languages, other_tags = handler.parse_tags(fs_name)
+        parsed_tags = handler.parse_tags(fs_name)
 
-        assert regions == []
-        assert revision == ""
-        assert languages == []
-        assert other_tags == []
+        assert parsed_tags.regions == []
+        assert parsed_tags.revision == ""
+        assert parsed_tags.version == ""
+        assert parsed_tags.languages == []
+        assert parsed_tags.other_tags == []
+
+    def test_parse_tags_version(self, handler: FSRomsHandler):
+        """Test parse_tags method with version tags"""
+        fs_name = "stardew_valley(v1.5.6.1988831614)(53038).exe"
+        parsed_tags = handler.parse_tags(fs_name)
+        assert parsed_tags.version == "1.5.6.1988831614"
+        assert "53038" in parsed_tags.other_tags
+        assert parsed_tags.regions == []
+        assert parsed_tags.revision == ""
+        assert parsed_tags.languages == []
+
+        fs_name = "My Game (Version 1.2.3).rom"
+        parsed_tags = handler.parse_tags(fs_name)
+        assert parsed_tags.version == "1.2.3"
+
+        fs_name = "My Game (Ver-1.2.3).rom"
+        parsed_tags = handler.parse_tags(fs_name)
+        assert parsed_tags.version == "1.2.3"
+
+        fs_name = "My Game (v_1.2.3).rom"
+        parsed_tags = handler.parse_tags(fs_name)
+        assert parsed_tags.version == "1.2.3"
+
+        fs_name = "My Game (v 1.2.3).rom"
+        parsed_tags = handler.parse_tags(fs_name)
+        assert parsed_tags.version == "1.2.3"
 
     def test_exclude_multi_roms_filters_excluded(self, handler: FSRomsHandler, config):
         """Test exclude_multi_roms filters out excluded multi-file ROMs"""
@@ -328,9 +357,9 @@ class TestFSRomsHandler:
             assert rom_files[0].file_path == "n64/roms"
             assert rom_files[0].file_size_bytes > 0
 
-            assert crc_hash == "efb5af2e"
-            assert md5_hash == "0f343b0931126a20f133d67c2b018a3b"
-            assert sha1_hash == "60cacbf3d72e1e7834203da608037b1bf83b40e8"
+            assert crc_hash == "13263b35"
+            assert md5_hash == "f1c2e022870405e373720e14fa6ab4a0"
+            assert sha1_hash == "91fe2e94ca7d01531002e99199bd8943c9d6e992"
 
     @pytest.mark.asyncio
     async def test_get_rom_files_multi_rom(
@@ -462,26 +491,23 @@ class TestFSRomsHandler:
     def test_tag_parsing_edge_cases(self, handler: FSRomsHandler):
         """Test tag parsing with edge cases"""
         # Test with comma-separated tags
-        regions, revision, languages, other_tags = handler.parse_tags(
-            "Game (USA,Europe) [En,Fr,De].rom"
-        )
-        assert "USA" in regions
-        assert "Europe" in regions
-        assert "English" in languages
-        assert "French" in languages
-        assert "German" in languages
+        parsed_tags = handler.parse_tags("Game (USA,Europe) [En,Fr,De].rom")
+        assert "USA" in parsed_tags.regions
+        assert "Europe" in parsed_tags.regions
+        assert "English" in parsed_tags.languages
+        assert "French" in parsed_tags.languages
+        assert "German" in parsed_tags.languages
+        assert parsed_tags.version == ""
 
         # Test with reg- prefix
-        regions, revision, languages, other_tags = handler.parse_tags(
-            "Game [Reg-NTSC].rom"
-        )
-        assert "NTSC" in regions
+        parsed_tags = handler.parse_tags("Game [Reg-NTSC].rom")
+        assert "NTSC" in parsed_tags.regions
+        assert parsed_tags.version == ""
 
         # Test with rev- prefix
-        regions, revision, languages, other_tags = handler.parse_tags(
-            "Game [Rev-B].rom"
-        )
-        assert revision == "B"
+        parsed_tags = handler.parse_tags("Game [Rev-B].rom")
+        assert parsed_tags.revision == "B"
+        assert parsed_tags.version == ""
 
     def test_platform_specific_behavior(self, handler: FSRomsHandler):
         """Test platform-specific behavior differences"""

From f867968f37b3d0d7976ea214443a57a7c47b8b13 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 11:42:38 -0500
Subject: [PATCH 59/73] refactor get_rom_files return value

---
 backend/endpoints/sockets/scan.py             | 21 ++--
 backend/handler/filesystem/roms_handler.py    | 23 +++--
 .../handler/filesystem/test_roms_handler.py   | 98 ++++++++++---------
 3 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/backend/endpoints/sockets/scan.py b/backend/endpoints/sockets/scan.py
index b9f013d4f..3f8af1a84 100644
--- a/backend/endpoints/sockets/scan.py
+++ b/backend/endpoints/sockets/scan.py
@@ -295,20 +295,17 @@ async def _identify_rom(
         calculate_hashes = not cm.get_config().SKIP_HASH_CALCULATION
         if calculate_hashes:
             log.debug(f"Calculating file hashes for {rom.fs_name}...")
-        (
-            rom_files,
-            rom_crc_c,
-            rom_md5_h,
-            rom_sha1_h,
-            rom_ra_h,
-        ) = await fs_rom_handler.get_rom_files(rom, calculate_hashes=calculate_hashes)
+
+        parsed_rom_files = await fs_rom_handler.get_rom_files(
+            rom, calculate_hashes=calculate_hashes
+        )
         fs_rom.update(
             {
-                "files": rom_files,
-                "crc_hash": rom_crc_c,
-                "md5_hash": rom_md5_h,
-                "sha1_hash": rom_sha1_h,
-                "ra_hash": rom_ra_h,
+                "files": parsed_rom_files.rom_files,
+                "crc_hash": parsed_rom_files.crc_hash,
+                "md5_hash": parsed_rom_files.md5_hash,
+                "sha1_hash": parsed_rom_files.sha1_hash,
+                "ra_hash": parsed_rom_files.ra_hash,
             }
         )
 
diff --git a/backend/handler/filesystem/roms_handler.py b/backend/handler/filesystem/roms_handler.py
index 998fe4f07..5c6401f59 100644
--- a/backend/handler/filesystem/roms_handler.py
+++ b/backend/handler/filesystem/roms_handler.py
@@ -303,6 +303,15 @@ class ParsedTags:
     other_tags: list[str]
 
 
+@dataclass(frozen=True)
+class ParsedRomFiles:
+    rom_files: list[RomFile]
+    crc_hash: str
+    md5_hash: str
+    sha1_hash: str
+    ra_hash: str
+
+
 class FSRomsHandler(FSHandler):
     def __init__(self) -> None:
         super().__init__(base_path=LIBRARY_BASE_PATH)
@@ -415,7 +424,7 @@ class FSRomsHandler(FSHandler):
 
     async def get_rom_files(
         self, rom: Rom, calculate_hashes: bool = True
-    ) -> tuple[list[RomFile], str, str, str, str]:
+    ) -> ParsedRomFiles:
         from adapters.services.rahasher import RAHasherService
         from handler.metadata import meta_ra_handler
 
@@ -574,20 +583,20 @@ class FSRomsHandler(FSHandler):
                 )
             )
 
-        return (
-            rom_files,
-            crc32_to_hex(rom_crc_c) if rom_crc_c != DEFAULT_CRC_C else "",
-            (
+        return ParsedRomFiles(
+            rom_files=rom_files,
+            crc_hash=crc32_to_hex(rom_crc_c) if rom_crc_c != DEFAULT_CRC_C else "",
+            md5_hash=(
                 rom_md5_h.hexdigest()
                 if rom_md5_h and rom_md5_h.digest() != DEFAULT_MD5_H_DIGEST
                 else ""
             ),
-            (
+            sha1_hash=(
                 rom_sha1_h.hexdigest()
                 if rom_sha1_h and rom_sha1_h.digest() != DEFAULT_SHA1_H_DIGEST
                 else ""
             ),
-            rom_ra_h,
+            ra_hash=rom_ra_h,
         )
 
     def _calculate_rom_hashes(
diff --git a/backend/tests/handler/filesystem/test_roms_handler.py b/backend/tests/handler/filesystem/test_roms_handler.py
index 7599f43ec..1cfe8c09b 100644
--- a/backend/tests/handler/filesystem/test_roms_handler.py
+++ b/backend/tests/handler/filesystem/test_roms_handler.py
@@ -347,20 +347,20 @@ class TestFSRomsHandler:
             m.setattr("handler.filesystem.roms_handler.cm.get_config", lambda: config)
             m.setattr("os.path.exists", lambda x: False)  # Normal structure
 
-            rom_files, crc_hash, md5_hash, sha1_hash, ra_hash = (
-                await handler.get_rom_files(rom_single)
+            parsed_rom_files = await handler.get_rom_files(rom_single)
+
+            assert len(parsed_rom_files.rom_files) == 1
+            assert isinstance(parsed_rom_files.rom_files[0], RomFile)
+            assert parsed_rom_files.rom_files[0].file_name == "Paper Mario (USA).z64"
+            assert parsed_rom_files.rom_files[0].file_path == "n64/roms"
+            assert parsed_rom_files.rom_files[0].file_size_bytes > 0
+
+            assert parsed_rom_files.crc_hash == "13263b35"
+            assert parsed_rom_files.md5_hash == "f1c2e022870405e373720e14fa6ab4a0"
+            assert (
+                parsed_rom_files.sha1_hash == "91fe2e94ca7d01531002e99199bd8943c9d6e992"
             )
 
-            assert len(rom_files) == 1
-            assert isinstance(rom_files[0], RomFile)
-            assert rom_files[0].file_name == "Paper Mario (USA).z64"
-            assert rom_files[0].file_path == "n64/roms"
-            assert rom_files[0].file_size_bytes > 0
-
-            assert crc_hash == "13263b35"
-            assert md5_hash == "f1c2e022870405e373720e14fa6ab4a0"
-            assert sha1_hash == "91fe2e94ca7d01531002e99199bd8943c9d6e992"
-
     @pytest.mark.asyncio
     async def test_get_rom_files_multi_rom(
         self, handler: FSRomsHandler, rom_multi, config
@@ -370,17 +370,15 @@ class TestFSRomsHandler:
             m.setattr("handler.filesystem.roms_handler.cm.get_config", lambda: config)
             m.setattr("os.path.exists", lambda x: False)  # Normal structure
 
-            rom_files, crc_hash, md5_hash, sha1_hash, ra_hash = (
-                await handler.get_rom_files(rom_multi)
-            )
+            parsed_rom_files = await handler.get_rom_files(rom_multi)
 
-            assert len(rom_files) >= 2  # Should have multiple parts
+            assert len(parsed_rom_files.rom_files) >= 2  # Should have multiple parts
 
-            file_names = [rf.file_name for rf in rom_files]
+            file_names = [rf.file_name for rf in parsed_rom_files.rom_files]
             assert "Super Mario 64 (J) (Rev A) [Part 1].z64" in file_names
             assert "Super Mario 64 (J) (Rev A) [Part 2].z64" in file_names
 
-            for rom_file in rom_files:
+            for rom_file in parsed_rom_files.rom_files:
                 assert isinstance(rom_file, RomFile)
                 assert rom_file.file_size_bytes > 0
                 assert rom_file.last_modified is not None
@@ -616,17 +614,15 @@ class TestFSRomsHandler:
         self, handler: FSRomsHandler, rom_single_nested
     ):
         """Test that only top-level files contribute to main ROM hash calculation"""
-        rom_files, rom_crc, rom_md5, rom_sha1, rom_ra = await handler.get_rom_files(
-            rom_single_nested
-        )
+        parsed_rom_files = await handler.get_rom_files(rom_single_nested)
 
         # Verify we have multiple files (base game + translation)
-        assert len(rom_files) == 2
+        assert len(parsed_rom_files.rom_files) == 2
 
         base_game_rom_file = None
         translation_rom_file = None
 
-        for rom_file in rom_files:
+        for rom_file in parsed_rom_files.rom_files:
             if rom_file.file_name == "Sonic (EU) [T].n64":
                 base_game_rom_file = rom_file
             elif rom_file.file_name == "Sonic (EU) [T-En].z64":
@@ -643,17 +639,17 @@ class TestFSRomsHandler:
         # (this verifies that the translation is not included in the main hash)
 
         assert (
-            rom_md5 == base_game_rom_file.md5_hash
+            parsed_rom_files.md5_hash == base_game_rom_file.md5_hash
         ), "Main ROM hash should include base game file"
         assert (
-            rom_md5 != translation_rom_file.md5_hash
+            parsed_rom_files.md5_hash != translation_rom_file.md5_hash
         ), "Main ROM hash should not include translation file"
 
         assert (
-            rom_sha1 == base_game_rom_file.sha1_hash
+            parsed_rom_files.sha1_hash == base_game_rom_file.sha1_hash
         ), "Main ROM hash should include base game file"
         assert (
-            rom_sha1 != translation_rom_file.sha1_hash
+            parsed_rom_files.sha1_hash != translation_rom_file.sha1_hash
         ), "Main ROM hash should not include translation file"
 
     @pytest.mark.asyncio
@@ -696,20 +692,24 @@ class TestFSRomsHandler:
         )
 
         # Run the hashing process
-        rom_files, crc_hash, md5_hash, sha1_hash, _ = await test_handler.get_rom_files(
-            rom
-        )
+        parsed_rom_files = await test_handler.get_rom_files(rom)
 
         # Assert that only SHA1 is populated, and it's from the header
-        assert len(rom_files) == 1
-        assert sha1_hash == internal_sha1, "SHA1 should be from CHD v5 header"
-        assert rom_files[0].sha1_hash == internal_sha1
+        assert len(parsed_rom_files.rom_files) == 1
+        assert (
+            parsed_rom_files.sha1_hash == internal_sha1
+        ), "SHA1 should be from CHD v5 header"
+        assert parsed_rom_files.rom_files[0].sha1_hash == internal_sha1
 
         # CRC32 and MD5 should be empty/zero (not calculated)
-        assert crc_hash == "", f"CRC hash should be empty, got: {crc_hash}"
-        assert md5_hash == "", f"MD5 hash should be empty, got: {md5_hash}"
-        assert rom_files[0].crc_hash == ""
-        assert rom_files[0].md5_hash == ""
+        assert (
+            parsed_rom_files.crc_hash == ""
+        ), f"CRC hash should be empty, got: {parsed_rom_files.crc_hash}"
+        assert (
+            parsed_rom_files.md5_hash == ""
+        ), f"MD5 hash should be empty, got: {parsed_rom_files.md5_hash}"
+        assert parsed_rom_files.rom_files[0].crc_hash == ""
+        assert parsed_rom_files.rom_files[0].md5_hash == ""
 
     @pytest.mark.asyncio
     async def test_get_rom_files_with_non_v5_chd_fallback_to_std_hashing(
@@ -747,20 +747,24 @@ class TestFSRomsHandler:
         )
 
         # Run the hashing process
-        rom_files, crc_hash, md5_hash, sha1_hash, _ = await test_handler.get_rom_files(
-            rom
-        )
+        parsed_rom_files = await test_handler.get_rom_files(rom)
 
         # All hashes should be populated (calculated from file content)
-        assert len(rom_files) == 1
-        assert crc_hash != "", "CRC hash should be calculated for non-v5 CHD"
-        assert md5_hash != "", "MD5 hash should be calculated for non-v5 CHD"
-        assert sha1_hash != "", "SHA1 hash should be calculated for non-v5 CHD"
+        assert len(parsed_rom_files.rom_files) == 1
+        assert (
+            parsed_rom_files.crc_hash != ""
+        ), "CRC hash should be calculated for non-v5 CHD"
+        assert (
+            parsed_rom_files.md5_hash != ""
+        ), "MD5 hash should be calculated for non-v5 CHD"
+        assert (
+            parsed_rom_files.sha1_hash != ""
+        ), "SHA1 hash should be calculated for non-v5 CHD"
 
         # Verify they're actual hash values (not from an internal header)
-        assert rom_files[0].crc_hash == crc_hash
-        assert rom_files[0].md5_hash == md5_hash
-        assert rom_files[0].sha1_hash == sha1_hash
+        assert parsed_rom_files.rom_files[0].crc_hash == parsed_rom_files.crc_hash
+        assert parsed_rom_files.rom_files[0].md5_hash == parsed_rom_files.md5_hash
+        assert parsed_rom_files.rom_files[0].sha1_hash == parsed_rom_files.sha1_hash
 
 
 class TestExtractCHDHash:

From 4305363aba21b9242940545f4b150543311d108f Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 11:44:06 -0500
Subject: [PATCH 60/73] undo conftest changes

---
 backend/tests/conftest.py | 80 +--------------------------------------
 1 file changed, 2 insertions(+), 78 deletions(-)

diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py
index 0a738ddeb..b2762387a 100644
--- a/backend/tests/conftest.py
+++ b/backend/tests/conftest.py
@@ -1,7 +1,3 @@
-import os
-import shutil
-from pathlib import Path
-
 import alembic.config
 import pytest
 from sqlalchemy import create_engine
@@ -27,80 +23,8 @@ session = sessionmaker(bind=engine, expire_on_commit=False)
 
 
 @pytest.fixture(scope="session", autouse=True)
-def setup_database(request):
-    original_cwd = os.getcwd()
-    try:
-        os.chdir(
-            os.path.join(os.path.dirname(__file__), "..")
-        )  # Change to backend directory
-        alembic.config.main(argv=["-c", "alembic.ini", "upgrade", "head"])
-    finally:
-        os.chdir(original_cwd)  # Restore original cwd
-
-    # Setup dummy library files for tests
-    library_base_path = Path(os.getcwd()) / "romm_test" / "library"
-
-    # Create necessary directories
-    (library_base_path / "n64" / "roms").mkdir(parents=True, exist_ok=True)
-    (library_base_path / "psx" / "roms").mkdir(parents=True, exist_ok=True)
-    (library_base_path / "n64" / "roms" / "Super Mario 64 (J) (Rev A)").mkdir(
-        parents=True, exist_ok=True
-    )
-    (library_base_path / "n64" / "roms" / "Test Multi Rom [USA]").mkdir(
-        parents=True, exist_ok=True
-    )
-    (library_base_path / "n64" / "roms" / "Sonic (EU) [T]" / "translation").mkdir(
-        parents=True, exist_ok=True
-    )
-
-    # Create dummy files
-    (library_base_path / "n64" / "roms" / "Paper Mario (USA).z64").write_bytes(
-        b"Paper Mario content"
-    )
-    (
-        library_base_path / "n64" / "roms" / "Zelda (USA) (Rev 1) [En,Fr] [Test].n64"
-    ).write_bytes(b"Zelda content")
-    (library_base_path / "n64" / "roms" / "test_game.n64").write_bytes(b"Test N64 ROM")
-    (library_base_path / "n64" / "roms" / "hash_test.n64").write_bytes(
-        b"Test ROM content for hashing"
-    )
-    (library_base_path / "n64" / "roms" / "excluded_test.tmp").write_bytes(
-        b"Excluded content"
-    )
-    (library_base_path / "psx" / "roms" / "PaRappa the Rapper.zip").write_bytes(
-        b"Zip content"
-    )
-    (
-        library_base_path
-        / "n64"
-        / "roms"
-        / "Super Mario 64 (J) (Rev A)"
-        / "Super Mario 64 (J) (Rev A) [Part 1].z64"
-    ).write_bytes(b"Part 1 content")
-    (
-        library_base_path
-        / "n64"
-        / "roms"
-        / "Super Mario 64 (J) (Rev A)"
-        / "Super Mario 64 (J) (Rev A) [Part 2].z64"
-    ).write_bytes(b"Part 2 content")
-    (
-        library_base_path / "n64" / "roms" / "Sonic (EU) [T]" / "Sonic (EU) [T].n64"
-    ).write_bytes(b"Sonic content")
-    (
-        library_base_path
-        / "n64"
-        / "roms"
-        / "Sonic (EU) [T]"
-        / "translation"
-        / "Sonic (EU) [T-En].z64"
-    ).write_bytes(b"Sonic translation content")
-
-    # Clean up dummy files after tests are done
-    def teardown_dummy_files():
-        shutil.rmtree(library_base_path, ignore_errors=True)
-
-    request.addfinalizer(teardown_dummy_files)
+def setup_database():
+    alembic.config.main(argv=["upgrade", "head"])
 
 
 @pytest.fixture(autouse=True)

From bdc7c265f1a963f25585015715818b73f5dc5c32 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 11:44:42 -0500
Subject: [PATCH 61/73] fix tests

---
 backend/tests/handler/filesystem/test_roms_handler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/tests/handler/filesystem/test_roms_handler.py b/backend/tests/handler/filesystem/test_roms_handler.py
index 1cfe8c09b..4694d64bc 100644
--- a/backend/tests/handler/filesystem/test_roms_handler.py
+++ b/backend/tests/handler/filesystem/test_roms_handler.py
@@ -355,10 +355,10 @@ class TestFSRomsHandler:
             assert parsed_rom_files.rom_files[0].file_path == "n64/roms"
             assert parsed_rom_files.rom_files[0].file_size_bytes > 0
 
-            assert parsed_rom_files.crc_hash == "13263b35"
-            assert parsed_rom_files.md5_hash == "f1c2e022870405e373720e14fa6ab4a0"
+            assert parsed_rom_files.crc_hash == "efb5af2e"
+            assert parsed_rom_files.md5_hash == "0f343b0931126a20f133d67c2b018a3b"
             assert (
-                parsed_rom_files.sha1_hash == "91fe2e94ca7d01531002e99199bd8943c9d6e992"
+                parsed_rom_files.sha1_hash == "60cacbf3d72e1e7834203da608037b1bf83b40e8"
             )
 
     @pytest.mark.asyncio

From 2dc3ab56b9edcd4ffa3bec743f4e66e66315a962 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 12:00:25 -0500
Subject: [PATCH 62/73] fill empty messages in migrations

---
 backend/alembic/versions/0009_models_refactor.py             | 2 +-
 backend/alembic/versions/0010_igdb_id_integerr.py            | 2 +-
 backend/alembic/versions/0011_drop_has_cover.py              | 2 +-
 backend/alembic/versions/0012_add_regions_languages.py       | 2 +-
 backend/alembic/versions/0013_upgrade_file_extension.py      | 2 +-
 backend/alembic/versions/0014_asset_files.py                 | 2 +-
 backend/alembic/versions/0015_mobygames_data.py              | 2 +-
 backend/alembic/versions/0016_user_last_login_active.py      | 2 +-
 backend/alembic/versions/0017_rom_notes.py                   | 2 +-
 backend/alembic/versions/0018_firmware.py                    | 2 +-
 backend/alembic/versions/0019_resources_refactor.py          | 2 +-
 backend/alembic/versions/0020_created_and_updated.py         | 2 +-
 backend/alembic/versions/0021_rom_user.py                    | 2 +-
 backend/alembic/versions/0022_collections_.py                | 2 +-
 backend/alembic/versions/0024_sibling_roms_db_view.py        | 2 +-
 backend/alembic/versions/0025_roms_hashes.py                 | 2 +-
 backend/alembic/versions/0026_romuser_status_fields.py       | 2 +-
 backend/alembic/versions/0028_user_email.py                  | 2 +-
 backend/alembic/versions/0031_datetime_to_timestamp.py       | 2 +-
 backend/alembic/versions/0032_longer_fs_fields.py            | 2 +-
 backend/alembic/versions/0033_rom_file_and_hashes.py         | 2 +-
 backend/alembic/versions/0034_virtual_collections_db_view.py | 2 +-
 backend/alembic/versions/0035_screenscraper.py               | 2 +-
 backend/alembic/versions/0036_screenscraper_platforms_id.py  | 2 +-
 backend/alembic/versions/0037_virtual_rom_columns.py         | 2 +-
 backend/alembic/versions/0038_add_ssid_to_sibling_roms.py    | 2 +-
 backend/alembic/versions/0041_assets_t_thumb_cleanup.py      | 2 +-
 backend/alembic/versions/0042_add_missing_from_fs.py         | 2 +-
 backend/alembic/versions/0043_launchbox_id.py                | 2 +-
 backend/alembic/versions/0044_hasheous_id.py                 | 2 +-
 backend/alembic/versions/0045_roms_metadata_update.py        | 2 +-
 backend/alembic/versions/0046_migrate_platform_slugs.py      | 2 +-
 backend/alembic/versions/0049_add_fs_size_bytes.py           | 2 +-
 backend/alembic/versions/0051_flashpoint_metadata.py         | 2 +-
 backend/alembic/versions/0052_roms_metadata_flashpoint.py    | 2 +-
 backend/alembic/versions/0054_add_platform_metadata_slugs.py | 2 +-
 backend/alembic/versions/0055_collection_is_favorite.py      | 2 +-
 backend/alembic/versions/0058_roms_metadata_launchbox.py     | 2 +-
 backend/alembic/versions/0059_rom_version_tag.py             | 3 +--
 39 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/backend/alembic/versions/0009_models_refactor.py b/backend/alembic/versions/0009_models_refactor.py
index 467760d3e..3779e390e 100644
--- a/backend/alembic/versions/0009_models_refactor.py
+++ b/backend/alembic/versions/0009_models_refactor.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Refactor platforms and roms tables
 
 Revision ID: 0009_models_refactor
 Revises: 2.0.0
diff --git a/backend/alembic/versions/0010_igdb_id_integerr.py b/backend/alembic/versions/0010_igdb_id_integerr.py
index 8e7ad272b..d4613f70c 100644
--- a/backend/alembic/versions/0010_igdb_id_integerr.py
+++ b/backend/alembic/versions/0010_igdb_id_integerr.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Change igdb_id and sgdb_id to integer
 
 Revision ID: 0010_igdb_id_integerr
 Revises: 0009_models_refactor
diff --git a/backend/alembic/versions/0011_drop_has_cover.py b/backend/alembic/versions/0011_drop_has_cover.py
index 11cd2f280..e9ac0982a 100644
--- a/backend/alembic/versions/0011_drop_has_cover.py
+++ b/backend/alembic/versions/0011_drop_has_cover.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Remove has_cover column from roms table
 
 Revision ID: 0011_drop_has_cover
 Revises: 0010_igdb_id_integerr
diff --git a/backend/alembic/versions/0012_add_regions_languages.py b/backend/alembic/versions/0012_add_regions_languages.py
index 83da434a8..177476ca3 100644
--- a/backend/alembic/versions/0012_add_regions_languages.py
+++ b/backend/alembic/versions/0012_add_regions_languages.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add support for multiple regions and languages
 
 Revision ID: 0012_add_regions_languages
 Revises: 0011_drop_has_cover
diff --git a/backend/alembic/versions/0013_upgrade_file_extension.py b/backend/alembic/versions/0013_upgrade_file_extension.py
index 589f5b5ac..1aa58c2e3 100644
--- a/backend/alembic/versions/0013_upgrade_file_extension.py
+++ b/backend/alembic/versions/0013_upgrade_file_extension.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Increase length of file_extension column
 
 Revision ID: 0013_upgrade_file_extension
 Revises: 0012_add_regions_languages
diff --git a/backend/alembic/versions/0014_asset_files.py b/backend/alembic/versions/0014_asset_files.py
index 9aeb10438..2b60964ea 100644
--- a/backend/alembic/versions/0014_asset_files.py
+++ b/backend/alembic/versions/0014_asset_files.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Introduce saves, screenshots, and states tables and refactor database schema
 
 Revision ID: 0014_asset_files
 Revises: 0013_upgrade_file_extension
diff --git a/backend/alembic/versions/0015_mobygames_data.py b/backend/alembic/versions/0015_mobygames_data.py
index f9fbddf68..269177c63 100644
--- a/backend/alembic/versions/0015_mobygames_data.py
+++ b/backend/alembic/versions/0015_mobygames_data.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add MobyGames data
 
 Revision ID: 0015_mobygames_data
 Revises: 0014_asset_files
diff --git a/backend/alembic/versions/0016_user_last_login_active.py b/backend/alembic/versions/0016_user_last_login_active.py
index 848400d21..a39790222 100644
--- a/backend/alembic/versions/0016_user_last_login_active.py
+++ b/backend/alembic/versions/0016_user_last_login_active.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Track user last login and active times
 
 Revision ID: 0016_user_last_login_active
 Revises: 0015_mobygames_data
diff --git a/backend/alembic/versions/0017_rom_notes.py b/backend/alembic/versions/0017_rom_notes.py
index 640080af6..d3a8112ec 100644
--- a/backend/alembic/versions/0017_rom_notes.py
+++ b/backend/alembic/versions/0017_rom_notes.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Create rom_notes table
 
 Revision ID: 0017_rom_notes
 Revises: 0016_user_last_login_active
diff --git a/backend/alembic/versions/0018_firmware.py b/backend/alembic/versions/0018_firmware.py
index 9d0083bbc..5cb25992d 100644
--- a/backend/alembic/versions/0018_firmware.py
+++ b/backend/alembic/versions/0018_firmware.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Create firmware table
 
 Revision ID: 0018_firmware
 Revises: 0017_rom_notes
diff --git a/backend/alembic/versions/0019_resources_refactor.py b/backend/alembic/versions/0019_resources_refactor.py
index f69cabbb8..b6f7957eb 100644
--- a/backend/alembic/versions/0019_resources_refactor.py
+++ b/backend/alembic/versions/0019_resources_refactor.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Refactor resource storage
 
 Revision ID: 0019_resources_refactor
 Revises: 0018_firmware
diff --git a/backend/alembic/versions/0020_created_and_updated.py b/backend/alembic/versions/0020_created_and_updated.py
index d255a7c8a..b4a1d09b4 100644
--- a/backend/alembic/versions/0020_created_and_updated.py
+++ b/backend/alembic/versions/0020_created_and_updated.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add created_at and updated_at columns
 
 Revision ID: 0020_created_and_updated
 Revises: 0019_resources_refactor
diff --git a/backend/alembic/versions/0021_rom_user.py b/backend/alembic/versions/0021_rom_user.py
index 6b3994623..5e94ed94c 100644
--- a/backend/alembic/versions/0021_rom_user.py
+++ b/backend/alembic/versions/0021_rom_user.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Rename rom_notes to rom_user and add is_main_sibling column
 
 Revision ID: 0021_rom_user
 Revises: 0020_created_and_updated
diff --git a/backend/alembic/versions/0022_collections_.py b/backend/alembic/versions/0022_collections_.py
index 89db6c89c..9382be091 100644
--- a/backend/alembic/versions/0022_collections_.py
+++ b/backend/alembic/versions/0022_collections_.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Migrate resources and create collections table
 
 Revision ID: 0022_collections
 Revises: 0021_rom_user
diff --git a/backend/alembic/versions/0024_sibling_roms_db_view.py b/backend/alembic/versions/0024_sibling_roms_db_view.py
index 8c31e0219..3dc28a86d 100644
--- a/backend/alembic/versions/0024_sibling_roms_db_view.py
+++ b/backend/alembic/versions/0024_sibling_roms_db_view.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Create sibling_roms view
 
 Revision ID: 0024_sibling_roms_db_view
 Revises: 0023_make_columns_non_nullable
diff --git a/backend/alembic/versions/0025_roms_hashes.py b/backend/alembic/versions/0025_roms_hashes.py
index 90c725c9d..cde46d77f 100644
--- a/backend/alembic/versions/0025_roms_hashes.py
+++ b/backend/alembic/versions/0025_roms_hashes.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add hashes to roms
 
 Revision ID: 0025_roms_hashes
 Revises: 0024_sibling_roms_db_view
diff --git a/backend/alembic/versions/0026_romuser_status_fields.py b/backend/alembic/versions/0026_romuser_status_fields.py
index 351776eda..ed811bf7c 100644
--- a/backend/alembic/versions/0026_romuser_status_fields.py
+++ b/backend/alembic/versions/0026_romuser_status_fields.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add status fields to rom_user table
 
 Revision ID: 0026_romuser_status_fields
 Revises: 0025_roms_hashes
diff --git a/backend/alembic/versions/0028_user_email.py b/backend/alembic/versions/0028_user_email.py
index 935f5411c..f3999108a 100644
--- a/backend/alembic/versions/0028_user_email.py
+++ b/backend/alembic/versions/0028_user_email.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add email to users table
 
 Revision ID: 0028_user_email
 Revises: 0027_platforms_data
diff --git a/backend/alembic/versions/0031_datetime_to_timestamp.py b/backend/alembic/versions/0031_datetime_to_timestamp.py
index 1c12ed23e..0367a3a6f 100644
--- a/backend/alembic/versions/0031_datetime_to_timestamp.py
+++ b/backend/alembic/versions/0031_datetime_to_timestamp.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Change DateTime columns to TIMESTAMP
 
 Revision ID: 0031_datetime_to_timestamp
 Revises: 0030_user_email_null
diff --git a/backend/alembic/versions/0032_longer_fs_fields.py b/backend/alembic/versions/0032_longer_fs_fields.py
index b0a31d722..be159f507 100644
--- a/backend/alembic/versions/0032_longer_fs_fields.py
+++ b/backend/alembic/versions/0032_longer_fs_fields.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Increase length of platform fields
 
 Revision ID: 0032_longer_fs_fields
 Revises: 0031_datetime_to_timestamp
diff --git a/backend/alembic/versions/0033_rom_file_and_hashes.py b/backend/alembic/versions/0033_rom_file_and_hashes.py
index b623227ab..ce4b1842e 100644
--- a/backend/alembic/versions/0033_rom_file_and_hashes.py
+++ b/backend/alembic/versions/0033_rom_file_and_hashes.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Introduce rom_files table and refactor roms table
 
 Revision ID: 0033_rom_file_and_hashes
 Revises: 0032_longer_fs_fields
diff --git a/backend/alembic/versions/0034_virtual_collections_db_view.py b/backend/alembic/versions/0034_virtual_collections_db_view.py
index 4ff2a6a78..5993af891 100644
--- a/backend/alembic/versions/0034_virtual_collections_db_view.py
+++ b/backend/alembic/versions/0034_virtual_collections_db_view.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Introduce collections_roms table and virtual_collections view
 
 Revision ID: 0034_virtual_collections_db_view
 Revises: 0033_rom_file_and_hashes
diff --git a/backend/alembic/versions/0035_screenscraper.py b/backend/alembic/versions/0035_screenscraper.py
index 7d2cab16d..4c86c9a54 100644
--- a/backend/alembic/versions/0035_screenscraper.py
+++ b/backend/alembic/versions/0035_screenscraper.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add ScreenScraper data
 
 Revision ID: 0035_screenscraper
 Revises: 0034_virtual_collections_db_view
diff --git a/backend/alembic/versions/0036_screenscraper_platforms_id.py b/backend/alembic/versions/0036_screenscraper_platforms_id.py
index d452b710f..c37792c27 100644
--- a/backend/alembic/versions/0036_screenscraper_platforms_id.py
+++ b/backend/alembic/versions/0036_screenscraper_platforms_id.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Populate ScreenScraper platform IDs
 
 Revision ID: 0036_screenscraper_platforms_id
 Revises: 0035_screenscraper
diff --git a/backend/alembic/versions/0037_virtual_rom_columns.py b/backend/alembic/versions/0037_virtual_rom_columns.py
index 1b1b05e5e..61b1dddb8 100644
--- a/backend/alembic/versions/0037_virtual_rom_columns.py
+++ b/backend/alembic/versions/0037_virtual_rom_columns.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Create or update roms_metadata view with consolidated metadata
 
 Revision ID: 0037_virtual_rom_columns
 Revises: 0036_screenscraper_platforms_id
diff --git a/backend/alembic/versions/0038_add_ssid_to_sibling_roms.py b/backend/alembic/versions/0038_add_ssid_to_sibling_roms.py
index dd10ea78e..e536931a8 100644
--- a/backend/alembic/versions/0038_add_ssid_to_sibling_roms.py
+++ b/backend/alembic/versions/0038_add_ssid_to_sibling_roms.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add ScreenScraper ID to sibling_roms view
 
 Revision ID: 0038_add_ssid_to_sibling_roms
 Revises: 0037_virtual_rom_columns
diff --git a/backend/alembic/versions/0041_assets_t_thumb_cleanup.py b/backend/alembic/versions/0041_assets_t_thumb_cleanup.py
index d14a7beea..8b4addd59 100644
--- a/backend/alembic/versions/0041_assets_t_thumb_cleanup.py
+++ b/backend/alembic/versions/0041_assets_t_thumb_cleanup.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Use higher resolution images for assets
 
 Revision ID: 0041_assets_t_thumb_cleanup
 Revises: 0040_migrate_assets_paths
diff --git a/backend/alembic/versions/0042_add_missing_from_fs.py b/backend/alembic/versions/0042_add_missing_from_fs.py
index 8a2899a33..f7dd1daa0 100644
--- a/backend/alembic/versions/0042_add_missing_from_fs.py
+++ b/backend/alembic/versions/0042_add_missing_from_fs.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add missing from filesystem to paltform, roms and files
 
 Revision ID: 0042_add_missing_from_fs
 Revises: 0041_assets_t_thumb_cleanup
diff --git a/backend/alembic/versions/0043_launchbox_id.py b/backend/alembic/versions/0043_launchbox_id.py
index 72aa974d1..c91a1cf39 100644
--- a/backend/alembic/versions/0043_launchbox_id.py
+++ b/backend/alembic/versions/0043_launchbox_id.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add Launchbox data and remove RetroAchievements metadata from rom_user
 
 Revision ID: 0043_launchbox_id
 Revises: 0042_add_missing_from_fs
diff --git a/backend/alembic/versions/0044_hasheous_id.py b/backend/alembic/versions/0044_hasheous_id.py
index 84b447c12..47bda4517 100644
--- a/backend/alembic/versions/0044_hasheous_id.py
+++ b/backend/alembic/versions/0044_hasheous_id.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add Hasheous and TGDB data
 
 Revision ID: 0044_hasheous_id
 Revises: 0043_launchbox_id
diff --git a/backend/alembic/versions/0045_roms_metadata_update.py b/backend/alembic/versions/0045_roms_metadata_update.py
index b3baf2247..e644429fc 100644
--- a/backend/alembic/versions/0045_roms_metadata_update.py
+++ b/backend/alembic/versions/0045_roms_metadata_update.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Create or update roms_metadata view
 
 Revision ID: 0045_roms_metadata_update
 Revises: 0044_hasheous_id
diff --git a/backend/alembic/versions/0046_migrate_platform_slugs.py b/backend/alembic/versions/0046_migrate_platform_slugs.py
index 447fb8642..a8f203688 100644
--- a/backend/alembic/versions/0046_migrate_platform_slugs.py
+++ b/backend/alembic/versions/0046_migrate_platform_slugs.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Standardize platform slugs
 
 Revision ID: 0046_migrate_platform_slugs
 Revises: 0045_roms_metadata_update
diff --git a/backend/alembic/versions/0049_add_fs_size_bytes.py b/backend/alembic/versions/0049_add_fs_size_bytes.py
index f7f734473..ad97b22ae 100644
--- a/backend/alembic/versions/0049_add_fs_size_bytes.py
+++ b/backend/alembic/versions/0049_add_fs_size_bytes.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add fs_size_bytes to roms table
 
 Revision ID: 0049_add_fs_size_bytes
 Revises: 0048_sibling_roms_more_ids
diff --git a/backend/alembic/versions/0051_flashpoint_metadata.py b/backend/alembic/versions/0051_flashpoint_metadata.py
index 12bd01315..27fa591ee 100644
--- a/backend/alembic/versions/0051_flashpoint_metadata.py
+++ b/backend/alembic/versions/0051_flashpoint_metadata.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add Flashpoint metadata
 
 Revision ID: 0051_flashpoint_metadata
 Revises: 0050_firmware_add_is_verified
diff --git a/backend/alembic/versions/0052_roms_metadata_flashpoint.py b/backend/alembic/versions/0052_roms_metadata_flashpoint.py
index c0cc380e9..5e4f246e2 100644
--- a/backend/alembic/versions/0052_roms_metadata_flashpoint.py
+++ b/backend/alembic/versions/0052_roms_metadata_flashpoint.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Update roms_metadata view to include flashpoint metadata
 
 Revision ID: 0052_roms_metadata_flashpoint
 Revises: 0051_flashpoint_metadata
diff --git a/backend/alembic/versions/0054_add_platform_metadata_slugs.py b/backend/alembic/versions/0054_add_platform_metadata_slugs.py
index b29cb08ec..e724f0a9d 100644
--- a/backend/alembic/versions/0054_add_platform_metadata_slugs.py
+++ b/backend/alembic/versions/0054_add_platform_metadata_slugs.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add metadata slugs to platform
 
 Revision ID: 0054_add_platform_metadata_slugs
 Revises: 0053_add_hltb_metadata
diff --git a/backend/alembic/versions/0055_collection_is_favorite.py b/backend/alembic/versions/0055_collection_is_favorite.py
index f58a44df4..d290875b0 100644
--- a/backend/alembic/versions/0055_collection_is_favorite.py
+++ b/backend/alembic/versions/0055_collection_is_favorite.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add is_favorite to collections
 
 Revision ID: 0055_collection_is_favorite
 Revises: 0054_add_platform_metadata_slugs
diff --git a/backend/alembic/versions/0058_roms_metadata_launchbox.py b/backend/alembic/versions/0058_roms_metadata_launchbox.py
index 4f0c4e494..50e1e108b 100644
--- a/backend/alembic/versions/0058_roms_metadata_launchbox.py
+++ b/backend/alembic/versions/0058_roms_metadata_launchbox.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Add launchbox to roms_metadata view
 
 Revision ID: 0058_roms_metadata_launchbox
 Revises: 0057_multi_notes
diff --git a/backend/alembic/versions/0059_rom_version_tag.py b/backend/alembic/versions/0059_rom_version_tag.py
index 1ffda8aea..c5ca88f58 100644
--- a/backend/alembic/versions/0059_rom_version_tag.py
+++ b/backend/alembic/versions/0059_rom_version_tag.py
@@ -1,4 +1,4 @@
-"""empty message
+"""Adds version column to roms table
 
 Revision ID: 0059_rom_version_tag
 Revises: 0058_roms_metadata_launchbox
@@ -8,7 +8,6 @@ Create Date: 2025-12-30 10:48:45.025990
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.dialects import mysql
 
 # revision identifiers, used by Alembic.
 revision = "0059_rom_version_tag"

From a45bde142e116811ef3f0c3a9d6cf94c9086f27f Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 16:37:55 -0500
Subject: [PATCH 63/73] [HOTFIX] Multi roms should only consider top-level
 files

---
 backend/models/rom.py                                  | 7 +++++--
 frontend/src/components/common/Game/Dialog/EditRom.vue | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/models/rom.py b/backend/models/rom.py
index 11021708a..4eacf351d 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -310,11 +310,14 @@ class Rom(BaseModel):
 
     @cached_property
     def has_nested_single_file(self) -> bool:
-        return len(self.files) == 1 and self.files[0].is_nested
+        return (
+            not self.has_simple_single_file
+            and len([f for f in self.files if f.is_top_level]) == 1
+        )
 
     @cached_property
     def has_multiple_files(self) -> bool:
-        return len(self.files) > 1
+        return len([f for f in self.files if f.is_top_level]) > 1
 
     @property
     def fs_resources_path(self) -> str:
diff --git a/frontend/src/components/common/Game/Dialog/EditRom.vue b/frontend/src/components/common/Game/Dialog/EditRom.vue
index 000941abb..643ba4e5e 100644
--- a/frontend/src/components/common/Game/Dialog/EditRom.vue
+++ b/frontend/src/components/common/Game/Dialog/EditRom.vue
@@ -308,7 +308,7 @@ function handleRomUpdateFromMetadata(updatedRom: UpdateRom) {
               v-model="rom.fs_name"
               :rules="[(value: string) => !!value || t('common.required')]"
               :label="
-                rom.has_multiple_files
+                rom.has_nested_single_file || rom.has_multiple_files
                   ? t('rom.folder-name')
                   : t('rom.filename')
               "

From 734645aa0795628f81379d065104faa8e0c8f209 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 16:45:32 -0500
Subject: [PATCH 64/73] cache top level files

---
 backend/models/rom.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/models/rom.py b/backend/models/rom.py
index 4eacf351d..3565bde82 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -308,16 +308,17 @@ class Rom(BaseModel):
     def has_simple_single_file(self) -> bool:
         return len(self.files) == 1 and not self.files[0].is_nested
 
+    @cached_property
+    def _top_level_files(self) -> list[RomFile]:
+        return [f for f in self.files if f.is_top_level]
+
     @cached_property
     def has_nested_single_file(self) -> bool:
-        return (
-            not self.has_simple_single_file
-            and len([f for f in self.files if f.is_top_level]) == 1
-        )
+        return not self.has_simple_single_file and len(self._top_level_files) == 1
 
     @cached_property
     def has_multiple_files(self) -> bool:
-        return len([f for f in self.files if f.is_top_level]) > 1
+        return len(self._top_level_files) > 1
 
     @property
     def fs_resources_path(self) -> str:

From e723664505806e0db4cce083df4ae91f7d867789 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Tue, 30 Dec 2025 19:12:11 -0500
Subject: [PATCH 65/73] cleanup has_notes field

---
 backend/endpoints/responses/rom.py       | 15 ++++-----------
 backend/handler/database/roms_handler.py |  1 +
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
index ad65dacd2..561728e12 100644
--- a/backend/endpoints/responses/rom.py
+++ b/backend/endpoints/responses/rom.py
@@ -269,6 +269,7 @@ class RomSchema(BaseModel):
     created_at: datetime
     updated_at: datetime
     missing_from_fs: bool
+    has_notes: bool
 
     siblings: list[SiblingRomSchema]
     rom_user: RomUserSchema
@@ -290,6 +291,9 @@ class RomSchema(BaseModel):
             )
             for s in db_rom.sibling_roms
         ]
+        db_rom.has_notes = any(  # type: ignore
+            note.is_public or note.user_id == request.user.id for note in db_rom.notes
+        )
         return db_rom
 
     @classmethod
@@ -329,20 +333,9 @@ class SiblingRomSchema(BaseModel):
 
 
 class SimpleRomSchema(RomSchema):
-    has_notes: bool = False
-
     @classmethod
     def from_orm_with_request(cls, db_rom: Rom, request: Request) -> SimpleRomSchema:
-        user_id = request.user.id
         db_rom = cls.populate_properties(db_rom, request)
-
-        # Calculate has_notes from already-loaded notes relationship
-        # Check if there are any notes for this ROM (public or user's own)
-        notes = getattr(db_rom, "notes", [])
-        db_rom.has_notes = any(  # type: ignore
-            note.is_public or note.user_id == user_id for note in notes
-        )
-
         return cls.model_validate(db_rom)
 
     @classmethod
diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index 5f20a6a7d..825d2273f 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -127,6 +127,7 @@ def with_details(func):
                 noload(Rom.platform), noload(Rom.metadatum)
             ),
             selectinload(Rom.collections),
+            selectinload(Rom.notes),
         )
         return func(*args, **kwargs)
 

From 649597b49451aaffbc2a1346475cad272bfc0253 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 31 Dec 2025 01:34:37 +0000
Subject: [PATCH 66/73] fix RA badgeds download

---
 backend/models/rom.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/models/rom.py b/backend/models/rom.py
index 3565bde82..2dcdefd7b 100644
--- a/backend/models/rom.py
+++ b/backend/models/rom.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import copy
 import enum
 from datetime import datetime
 from functools import cached_property
@@ -393,13 +394,18 @@ class Rom(BaseModel):
     @cached_property
     def merged_ra_metadata(self) -> dict[str, list] | None:
         if self.ra_metadata and "achievements" in self.ra_metadata:
-            for achievement in self.ra_metadata.get("achievements", []):
+            # Create a deep copy to avoid mutating the original metadata
+            # This ensures that badge paths remain relative for filesystem operations
+            # while the frontend receives absolute paths
+            metadata_copy = copy.deepcopy(self.ra_metadata)
+            for achievement in metadata_copy.get("achievements", []):
                 achievement["badge_path_lock"] = (
                     f"{FRONTEND_RESOURCES_PATH}/{achievement['badge_path_lock']}"
                 )
                 achievement["badge_path"] = (
                     f"{FRONTEND_RESOURCES_PATH}/{achievement['badge_path']}"
                 )
+            return metadata_copy
         return self.ra_metadata
 
     # Used only during scan process

From 9f2c853d696ee5663ef1154c269d3b4ff0204d19 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 31 Dec 2025 11:53:14 +0000
Subject: [PATCH 67/73] add ui_settings column to users table

---
 .../{0058_user_ui_settings.py => 0060_user_ui_settings.py}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename backend/alembic/versions/{0058_user_ui_settings.py => 0060_user_ui_settings.py} (92%)

diff --git a/backend/alembic/versions/0058_user_ui_settings.py b/backend/alembic/versions/0060_user_ui_settings.py
similarity index 92%
rename from backend/alembic/versions/0058_user_ui_settings.py
rename to backend/alembic/versions/0060_user_ui_settings.py
index 8ad41d97e..5a09eb23f 100644
--- a/backend/alembic/versions/0058_user_ui_settings.py
+++ b/backend/alembic/versions/0060_user_ui_settings.py
@@ -1,7 +1,7 @@
 """user_ui_settings
 
 Revision ID: 0058_user_ui_settings
-Revises: 0057_multi_notes
+Revises: 0059_rom_version_tag
 Create Date: 2025-12-16 21:02:52.394533
 
 """
@@ -12,7 +12,7 @@ from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "0058_user_ui_settings"
-down_revision = "0057_multi_notes"
+down_revision = "0059_rom_version_tag"
 branch_labels = None
 depends_on = None
 

From 93387471c5d5aeb7c8190447f6228b57e77ef0ee Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 31 Dec 2025 11:54:58 +0000
Subject: [PATCH 68/73] fix: update revision ID in user_ui_settings migration

---
 backend/alembic/versions/0060_user_ui_settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/alembic/versions/0060_user_ui_settings.py b/backend/alembic/versions/0060_user_ui_settings.py
index 5a09eb23f..6ad6bf9a7 100644
--- a/backend/alembic/versions/0060_user_ui_settings.py
+++ b/backend/alembic/versions/0060_user_ui_settings.py
@@ -1,6 +1,6 @@
 """user_ui_settings
 
-Revision ID: 0058_user_ui_settings
+Revision ID: 0060_user_ui_settings
 Revises: 0059_rom_version_tag
 Create Date: 2025-12-16 21:02:52.394533
 
@@ -11,7 +11,7 @@ from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = "0058_user_ui_settings"
+revision = "0060_user_ui_settings"
 down_revision = "0059_rom_version_tag"
 branch_labels = None
 depends_on = None

From 24912eb109c266c72ddab57731ab9ffe0e425612 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Wed, 31 Dec 2025 09:56:00 -0500
Subject: [PATCH 69/73] Also replace - with : in edge cases

---
 backend/handler/metadata/hltb_handler.py      | 8 ++++----
 backend/handler/metadata/launchbox_handler.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/handler/metadata/hltb_handler.py b/backend/handler/metadata/hltb_handler.py
index 20cef8da3..40ff8147b 100644
--- a/backend/handler/metadata/hltb_handler.py
+++ b/backend/handler/metadata/hltb_handler.py
@@ -16,6 +16,7 @@ from .base_handler import BaseRom, MetadataHandler
 
 # Regex to detect HLTB ID tags in filenames like (hltb-12345)
 HLTB_TAG_REGEX = re.compile(r"\(hltb-(\d+)\)", re.IGNORECASE)
+DASH_COLON_REGEX = re.compile(r"\s?-\s")
 
 
 class HLTBPlatform(TypedDict):
@@ -411,10 +412,9 @@ class HLTBHandler(MetadataHandler):
         if not HLTB_API_ENABLED:
             return HLTBRom(hltb_id=None)
 
-        # We replace " - " with ": " to match HowLongToBeat's naming convention
-        search_term = fs_rom_handler.get_file_name_with_no_tags(fs_name).replace(
-            " - ", ": "
-        )
+        search_term = fs_rom_handler.get_file_name_with_no_tags(fs_name)
+        # We replace " - "/"- " with ": " to match HowLongToBeat's naming convention
+        search_term = re.sub(DASH_COLON_REGEX, ": ", search_term)
         search_term = self.normalize_search_term(search_term, remove_punctuation=False)
 
         # Search for games
diff --git a/backend/handler/metadata/launchbox_handler.py b/backend/handler/metadata/launchbox_handler.py
index 8d5418bb1..ce081802d 100644
--- a/backend/handler/metadata/launchbox_handler.py
+++ b/backend/handler/metadata/launchbox_handler.py
@@ -25,6 +25,7 @@ LAUNCHBOX_FILES_KEY: Final[str] = "romm:launchbox_files"
 
 # Regex to detect LaunchBox ID tags in filenames like (launchbox-12345)
 LAUNCHBOX_TAG_REGEX = re.compile(r"\(launchbox-(\d+)\)", re.IGNORECASE)
+DASH_COLON_REGEX = re.compile(r"\s?-\s")
 
 
 class LaunchboxPlatform(TypedDict):
@@ -259,10 +260,9 @@ class LaunchboxHandler(MetadataHandler):
         # By default, tags are still stripped to keep scan behavior consistent with previous versions.
         # If `keep_tags` is True, the full `fs_name` is used for searching.
         if not keep_tags:
-            # We replace " - " with ": " to match Launchbox's naming convention
-            search_term = fs_rom_handler.get_file_name_with_no_tags(fs_name).replace(
-                " - ", ": "
-            )
+            search_term = fs_rom_handler.get_file_name_with_no_tags(fs_name)
+            # We replace " - "/"- " with ": " to match Launchbox's naming convention
+            search_term = re.sub(DASH_COLON_REGEX, ": ", search_term)
         else:
             search_term = fs_name
 

From 006cf2e2eb686b937732ad4d6407d32e54f16021 Mon Sep 17 00:00:00 2001
From: zurdi <contact@zurdi.dev>
Date: Wed, 31 Dec 2025 15:17:41 +0000
Subject: [PATCH 70/73] Refactor last played filter logic and clean up unused
 API helper

---
 backend/handler/database/roms_handler.py           | 10 ++++++----
 .../Gallery/AppBar/common/FilterDrawer/Base.vue    | 10 +---------
 frontend/src/utils/apiHelpers.ts                   | 14 --------------
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 frontend/src/utils/apiHelpers.ts

diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py
index e465f5ce2..5d787ec57 100644
--- a/backend/handler/database/roms_handler.py
+++ b/backend/handler/database/roms_handler.py
@@ -318,10 +318,12 @@ class DBRomsHandler(DBBaseHandler):
         if not user_id:
             return query
 
-        predicate = RomUser.last_played.isnot(None)
-        if not value:
-            predicate = RomUser.last_played.is_(None)
-        return query.filter(predicate)
+        has_last_played = (
+            RomUser.last_played.is_(None)
+            if not value
+            else RomUser.last_played.isnot(None)
+        )
+        return query.filter(has_last_played)
 
     def filter_by_has_ra(self, query: Query, value: bool) -> Query:
         predicate = Rom.ra_id.isnot(None)
diff --git a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
index 05c902fcd..3ac17a956 100644
--- a/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
+++ b/frontend/src/components/Gallery/AppBar/common/FilterDrawer/Base.vue
@@ -278,15 +278,7 @@ async function fetchSearchFilteredRoms() {
       filterRA: null,
       filterMissing: null,
       filterVerified: null,
-      // Exclude all single and multi-value filters to get all possible options
-      selectedGenre: null,
-      selectedFranchise: null,
-      selectedCollection: null,
-      selectedCompany: null,
-      selectedAgeRating: null,
-      selectedStatus: null,
-      selectedRegion: null,
-      selectedLanguage: null,
+      // Exclude all multi-value filters to get all possible options
       selectedGenres: null,
       selectedFranchises: null,
       selectedCollections: null,
diff --git a/frontend/src/utils/apiHelpers.ts b/frontend/src/utils/apiHelpers.ts
deleted file mode 100644
index 5345030e9..000000000
--- a/frontend/src/utils/apiHelpers.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Helper function to handle single vs multi-value parameters for API requests
- */
-export function getFilterArray(
-  single: string | null | undefined,
-  multi: string[] | null | undefined,
-): string[] | undefined {
-  const result = (() => {
-    if (multi && multi.length > 0) return multi;
-    if (single) return [single];
-    return undefined;
-  })();
-  return result;
-}

From aa11eba387a7dd6a740b334eb152ebbb6a66413a Mon Sep 17 00:00:00 2001
From: SaraVieira <hey@iamsaravieira.com>
Date: Wed, 31 Dec 2025 18:50:12 +0000
Subject: [PATCH 71/73] Add CPS1-3 and TIC-80

---
 backend/handler/metadata/base_handler.py          |   4 ++++
 backend/handler/metadata/ss_handler.py            |  14 +++++++++++---
 .../platforms/systematic/{tic.svg => tic-80.svg}  |   2 +-
 frontend/assets/platforms/{tic.ico => tic-80.ico} | Bin
 4 files changed, 16 insertions(+), 4 deletions(-)
 rename frontend/assets/platforms/systematic/{tic.svg => tic-80.svg} (98%)
 rename frontend/assets/platforms/{tic.ico => tic-80.ico} (100%)

diff --git a/backend/handler/metadata/base_handler.py b/backend/handler/metadata/base_handler.py
index 711fe5693..e7b02469c 100644
--- a/backend/handler/metadata/base_handler.py
+++ b/backend/handler/metadata/base_handler.py
@@ -377,6 +377,9 @@ class UniversalPlatformSlug(enum.StrEnum):
     COMPUCOLOR_II = "compucolor-ii"
     COMPUCORP_PROGRAMMABLE_CALCULATOR = "compucorp-programmable-calculator"
     CPET = "cpet"
+    CPS1 = "cps1"
+    CPS2 = "cps2"
+    CPS3 = "cps3"
     CPM = "cpm"
     CREATIVISION = "creativision"
     CYBERVISION = "cybervision"
@@ -672,6 +675,7 @@ class UniversalPlatformSlug(enum.StrEnum):
     TI_99 = "ti-99"
     TI_994A = "ti-994a"
     TI_PROGRAMMABLE_CALCULATOR = "ti-programmable-calculator"
+    TIC_80 = "tic-80"
     TIKI_100 = "tiki-100"
     TIM = "tim"
     TIMEX_SINCLAIR_2068 = "timex-sinclair-2068"
diff --git a/backend/handler/metadata/ss_handler.py b/backend/handler/metadata/ss_handler.py
index 7d3715bf1..76c507cd0 100644
--- a/backend/handler/metadata/ss_handler.py
+++ b/backend/handler/metadata/ss_handler.py
@@ -61,7 +61,7 @@ PS1_SS_ID: Final = 57
 PS2_SS_ID: Final = 58
 PSP_SS_ID: Final = 61
 SWITCH_SS_ID: Final = 225
-ARCADE_SS_ID: Final = 75
+ARCADES_SS_IDS: Final = [75, 6, 7, 8]
 
 # Regex to detect ScreenScraper ID tags in filenames like (ssfr-12345)
 SS_TAG_REGEX = re.compile(r"\(ssfr-(\d+)\)", re.IGNORECASE)
@@ -651,7 +651,7 @@ class SSHandler(MetadataHandler):
                 )
 
         # Support for MAME arcade filename format
-        if platform_ss_id == ARCADE_SS_ID:
+        if platform_ss_id in ARCADES_SS_IDS:
             search_term = await self._mame_format(search_term)
             fallback_rom = SSRom(ss_id=None, name=search_term)
 
@@ -736,7 +736,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.ANDROID: {"id": 63, "name": "Android"},
     UPS.APPLEII: {"id": 86, "name": "Apple II"},
     UPS.APPLE_IIGS: {"id": 51, "name": "Apple IIGS"},
-    UPS.ARCADE: {"id": ARCADE_SS_ID, "name": "Arcade"},
+    UPS.ARCADE: {"id": ARCADES_SS_IDS[0], "name": "Arcade"},
     UPS.ARCADIA_2001: {"id": 94, "name": "Arcadia 2001"},
     UPS.ARDUBOY: {"id": 263, "name": "Arduboy"},
     UPS.ATARI2600: {"id": 26, "name": "Atari 2600"},
@@ -746,6 +746,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.ATARI_ST: {"id": 42, "name": "Atari ST"},
     UPS.ATOM: {"id": 36, "name": "Atom"},
     UPS.BBCMICRO: {"id": 37, "name": "BBC Micro"},
+    UPS.BK: {"id": 93, "name": "Elektronika BK"},
     UPS.ASTROCADE: {"id": 44, "name": "Astrocade"},
     UPS.PHILIPS_CD_I: {"id": 133, "name": "CD-i"},
     UPS.COMMODORE_CDTV: {"id": 129, "name": "Amiga CDTV"},
@@ -760,6 +761,9 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.C_PLUS_4: {"id": 99, "name": "Plus/4"},
     UPS.C16: {"id": 99, "name": "Plus/4"},
     UPS.C64: {"id": 66, "name": "Commodore 64"},
+    UPS.CPS1: {"id": ARCADES_SS_IDS[1], "name": "Capcom Play System"},
+    UPS.CPS2: {"id": ARCADES_SS_IDS[2], "name": "Capcom Play System 2"},
+    UPS.CPS3: {"id": ARCADES_SS_IDS[3], "name": "Capcom Play System 3"},
     UPS.CPET: {"id": 240, "name": "PET"},
     UPS.CREATIVISION: {"id": 241, "name": "CreatiVision"},
     UPS.DOS: {"id": 135, "name": "PC Dos"},
@@ -783,6 +787,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.GB: {"id": 9, "name": "Game Boy"},
     UPS.GBA: {"id": 12, "name": "Game Boy Advance"},
     UPS.GBC: {"id": 10, "name": "Game Boy Color"},
+    UPS.GAMATE: {"id": 266, "name": "Gamate"},
     UPS.GAMEGEAR: {"id": 21, "name": "Game Gear"},
     UPS.GAME_DOT_COM: {"id": 121, "name": "Game.com"},
     UPS.NGC: {"id": 13, "name": "GameCube"},
@@ -821,6 +826,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.PC_8800_SERIES: {"id": 221, "name": "NEC PC-8801"},
     UPS.PC_9800_SERIES: {"id": 208, "name": "NEC PC-9801"},
     UPS.PC_FX: {"id": 72, "name": "PC-FX"},
+    UPS.PEGASUS: {"id": 83, "name": "Aamber Pegasus"},
     UPS.PICO: {"id": 234, "name": "Pico-8"},
     UPS.PSVITA: {"id": 62, "name": "PS Vita"},
     UPS.PSP: {"id": PSP_SS_ID, "name": "PSP"},
@@ -842,6 +848,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.SNES: {"id": 4, "name": "Super Nintendo"},
     UPS.SFAM: {"id": 4, "name": "Super Famicom"},
     UPS.X1: {"id": 220, "name": "Sharp X1"},
+    UPS.SCUMMVM: {"id": 123, "name": "ScummVM"},
     UPS.SHARP_X68000: {"id": 79, "name": "Sharp X68000"},
     UPS.SPECTRAVIDEO: {"id": 218, "name": "Spectravideo"},
     UPS.SUFAMI_TURBO: {"id": 108, "name": "Sufami Turbo"},
@@ -849,6 +856,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.SUPERGRAFX: {"id": 105, "name": "PC Engine SuperGrafx"},
     UPS.SUPERVISION: {"id": 207, "name": "Watara Supervision"},
     UPS.TI_99: {"id": 205, "name": "TI-99/4A"},
+    UPS.TIC_80: {"id": 222, "name": "TIC-80"},
     UPS.TRS_80_COLOR_COMPUTER: {
         "id": 144,
         "name": "TRS-80 Color Computer",
diff --git a/frontend/assets/platforms/systematic/tic.svg b/frontend/assets/platforms/systematic/tic-80.svg
similarity index 98%
rename from frontend/assets/platforms/systematic/tic.svg
rename to frontend/assets/platforms/systematic/tic-80.svg
index 1adb81684..5a7964d4e 100755
--- a/frontend/assets/platforms/systematic/tic.svg
+++ b/frontend/assets/platforms/systematic/tic-80.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="320" height="320" viewBox="0 0 320 320"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M0 256h256V0H0Z"/></clipPath><clipPath id="b" clipPathUnits="userSpaceOnUse"><path d="M8 248h240V8H8Z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"><g clip-path="url(#b)" style="opacity:.5"><path d="M0 0h-24v48h-16v16h-176V48h-16v-208h16v-16h64v16h32v-16h64v16h16v16h16v64h16v16H8V0z" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(240 184)"/></g></g><path d="M0 0h-20v-176H0v64h16v16H0Z" style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 266.667 32)"/><path d="M224 128h16v48h-16zM176 16h-48v20h48zM32 36h48V16H32Z" style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M192 52H16V32h176zm0 168H32v20h160z" style="fill:#354f9f;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M192 48H16v176h176z" style="fill:#4b5da7;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M176 188H32v20h144z" style="fill:#354f9f;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M176 112H32v80h144z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M144 128h-16v48h16zm-64 0H64v48h16z" style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M144 96h-16V80h16zm-64 0H64V80h16Zm48-32H80v16h48z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="320" height="320" viewBox="0 0 320 320"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M0 256h256V0H0Z"/></clipPath><clipPath id="b" clipPathUnits="userSpaceOnUse"><path d="M8 248h240V8H8Z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"><g clip-path="url(#b)" style="opacity:.5"><path d="M0 0h-24v48h-16v16h-176V48h-16v-208h16v-16h64v16h32v-16h64v16h16v16h16v64h16v16H8V0z" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(240 184)"/></g></g><path d="M0 0h-20v-176H0v64h16v16H0Z" style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 266.667 32)"/><path d="M224 128h16v48h-16zM176 16h-48v20h48zM32 36h48V16H32Z" style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M192 52H16V32h176zm0 168H32v20h160z" style="fill:#354f9f;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M192 48H16v176h176z" style="fill:#4b5da7;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M176 188H32v20h144z" style="fill:#354f9f;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M176 112H32v80h144z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M144 128h-16v48h16zm-64 0H64v48h16z" style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/><path d="M144 96h-16V80h16zm-64 0H64V80h16Zm48-32H80v16h48z" style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="matrix(1.33333 0 0 -1.33333 -10.667 330.667)"/></svg>
diff --git a/frontend/assets/platforms/tic.ico b/frontend/assets/platforms/tic-80.ico
similarity index 100%
rename from frontend/assets/platforms/tic.ico
rename to frontend/assets/platforms/tic-80.ico

From c85841a4eae032180175e7f5517fae9109ac3f2e Mon Sep 17 00:00:00 2001
From: SaraVieira <hey@iamsaravieira.com>
Date: Wed, 31 Dec 2025 18:58:40 +0000
Subject: [PATCH 72/73] clean up magical numbers

---
 backend/handler/metadata/ss_handler.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/handler/metadata/ss_handler.py b/backend/handler/metadata/ss_handler.py
index 76c507cd0..fba463d3b 100644
--- a/backend/handler/metadata/ss_handler.py
+++ b/backend/handler/metadata/ss_handler.py
@@ -61,7 +61,11 @@ PS1_SS_ID: Final = 57
 PS2_SS_ID: Final = 58
 PSP_SS_ID: Final = 61
 SWITCH_SS_ID: Final = 225
-ARCADES_SS_IDS: Final = [75, 6, 7, 8]
+ARCADE_SS_ID: Final = 75
+CPS1_SS_ID: Final = 6
+CPS2_SS_ID: Final = 7
+CPS3_SS_ID: Final = 8
+ARCADES_SS_IDS: Final = [ARCADE_SS_ID, CPS1_SS_ID, CPS2_SS_ID, CPS3_SS_ID]
 
 # Regex to detect ScreenScraper ID tags in filenames like (ssfr-12345)
 SS_TAG_REGEX = re.compile(r"\(ssfr-(\d+)\)", re.IGNORECASE)
@@ -736,7 +740,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.ANDROID: {"id": 63, "name": "Android"},
     UPS.APPLEII: {"id": 86, "name": "Apple II"},
     UPS.APPLE_IIGS: {"id": 51, "name": "Apple IIGS"},
-    UPS.ARCADE: {"id": ARCADES_SS_IDS[0], "name": "Arcade"},
+    UPS.ARCADE: {"id": ARCADE_SS_ID, "name": "Arcade"},
     UPS.ARCADIA_2001: {"id": 94, "name": "Arcadia 2001"},
     UPS.ARDUBOY: {"id": 263, "name": "Arduboy"},
     UPS.ATARI2600: {"id": 26, "name": "Atari 2600"},
@@ -761,9 +765,9 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.C_PLUS_4: {"id": 99, "name": "Plus/4"},
     UPS.C16: {"id": 99, "name": "Plus/4"},
     UPS.C64: {"id": 66, "name": "Commodore 64"},
-    UPS.CPS1: {"id": ARCADES_SS_IDS[1], "name": "Capcom Play System"},
-    UPS.CPS2: {"id": ARCADES_SS_IDS[2], "name": "Capcom Play System 2"},
-    UPS.CPS3: {"id": ARCADES_SS_IDS[3], "name": "Capcom Play System 3"},
+    UPS.CPS1: {"id": CPS1_SS_ID, "name": "Capcom Play System"},
+    UPS.CPS2: {"id": CPS2_SS_ID, "name": "Capcom Play System 2"},
+    UPS.CPS3: {"id": CPS3_SS_ID, "name": "Capcom Play System 3"},
     UPS.CPET: {"id": 240, "name": "PET"},
     UPS.CREATIVISION: {"id": 241, "name": "CreatiVision"},
     UPS.DOS: {"id": 135, "name": "PC Dos"},
@@ -839,6 +843,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.PS5: {"id": 284, "name": "Playstation 5"},
     UPS.POKEMON_MINI: {"id": 211, "name": "Pokémon mini"},
     UPS.SAM_COUPE: {"id": 213, "name": "MGT SAM Coupé"},
+    UPS.SCUMMVM: {"id": 123, "name": "ScummVM"},
     UPS.SEGA32: {"id": 19, "name": "Megadrive 32X"},
     UPS.SEGACD: {"id": 20, "name": "Mega-CD"},
     UPS.SMS: {"id": 2, "name": "Master System"},
@@ -848,7 +853,6 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.SNES: {"id": 4, "name": "Super Nintendo"},
     UPS.SFAM: {"id": 4, "name": "Super Famicom"},
     UPS.X1: {"id": 220, "name": "Sharp X1"},
-    UPS.SCUMMVM: {"id": 123, "name": "ScummVM"},
     UPS.SHARP_X68000: {"id": 79, "name": "Sharp X68000"},
     UPS.SPECTRAVIDEO: {"id": 218, "name": "Spectravideo"},
     UPS.SUFAMI_TURBO: {"id": 108, "name": "Sufami Turbo"},

From d76cd3412b05233d00e0cdc77d4f6b37c093e947 Mon Sep 17 00:00:00 2001
From: Georges-Antoine Assi <contact@me.gantoine.com>
Date: Wed, 31 Dec 2025 14:23:23 -0500
Subject: [PATCH 73/73] fix tic-80 in batocera config

---
 examples/config.batocera-retrobat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/config.batocera-retrobat.yml b/examples/config.batocera-retrobat.yml
index 0c125064c..5924ce148 100644
--- a/examples/config.batocera-retrobat.yml
+++ b/examples/config.batocera-retrobat.yml
@@ -133,7 +133,7 @@ system:
     switch: switch
     thomson: thomson-mo5
     ti99: ti-99
-    tic80: tic
+    tic80: tic-80
     triforce: arcade
     tutor: tomy-tutor
     vectrex: vectrex