chore(release): bump version to v1.1.8

- Move preset apply handler from span.preset-name to div.filter-preset so
  clicking anywhere on the tile triggers the preset, not just the label text.
- Add whitespace heuristic in showToast() to skip translate() for plain
  messages that are already translated at the call site. This prevents
  i18next from logging 'Translation key not found' for pre-translated
  strings like 'Preset "name" applied'.

data/supporters.json

@@ -10,13 +10,17 @@
     "Brennok",
     "2018cfh",
     "Insomnia Art Designs",
-    "Rob Williams",
     "Arlecchino Shion",
     "Charles Blakemore",
+    "Rob Williams",
     "$MetaSamsara",
     "W+K+White",
     "stone9k",
+    "Rosenthal",
+    "Francisco Tatis",
+    "Mozzel",
     "Gingko Biloba",
+    "Birdy",
     "Kiba",
     "onesecondinosaur",
     "Christian Byrne",
@@ -27,22 +31,25 @@
     "Phil",
     "Carl G.",
     "Dsperado",
-    "Rosenthal",
     "ClockDaemon",
-    "Francisco Tatis",
     "Tobi_Swagg",
+    "SG",
+    "jmack",
     "Andrew Wilson",
     "Greybush",
     "Ricky Carter",
     "JongWon Han",
     "VantAI",
+    "レプサイ",
     "Michael Wong",
     "Illrigger",
     "Tom Corrigan",
     "JackieWang",
     "FreelancerZ",
     "fnkylove",
+    "Lilleman",
     "Robert Stacey",
+    "PM",
     "Edgar Tejeda",
     "Liam MacDougal",
     "Polymorphic Indeterminate",
@@ -50,9 +57,7 @@
     "Dogwalkerbr",
     "Skalabananen",
     "Marc Whiffen",
-    "Birdy",
     "itismyelement",
-    "Mozzel",
     "quarz",
     "Reno Lam",
     "jean jahren",
@@ -65,40 +70,46 @@
     "Jonathan Ross",
     "KD",
     "Omnidex",
-    "Nazono_hito",
+    "Nolife_M",
+    "Melville Parrish",
     "daniel dove",
+    "Lustre",
     "Tyler Trebuchon",
     "Release Cabrakan",
     "JW Sin",
     "Alex",
-    "SG",
+    "bh",
     "carozzz",
+    "Marlon Daniels",
     "James Dooley",
     "zenbound",
     "Buzzard",
-    "jmack",
+    "Aaron Bleuer",
+    "LacesOut!",
     "Adam Shaw",
     "Mark Corneglio",
     "SarcasticHashtag",
     "RedrockVP",
     "James Todd",
     "Wicked Choices by ASLPro3D",
+    "FinalyFree",
+    "Weasyl",
     "Steven Pfeiffer",
-    "レプサイ",
     "Timmy",
     "Johnny",
+    "Cory Paza",
     "Tak",
     "Lisster",
     "runte3221",
     "Big Red",
     "whudunit",
+    "Luc Job",
     "dl0901dm",
+    "corde",
     "Yushio",
     "Vik71it",
     "Bishoujoker",
     "Echo",
-    "Lilleman",
-    "PM",
     "Todd Keck",
     "Briton Heilbrun",
     "wildnut",
@@ -108,53 +119,51 @@
     "BadassArabianMofo",
     "Pascal Dahle",
     "Greg",
+    "Sangheili460",
+    "MagnaInsomnia",
+    "Akira_HentAI",
+    "Karl P.",
     "MiraiKuriyamaSy",
     "otaku fra",
     "lmsupporter",
     "andrew.tappan",
     "Takkan",
+    "N/A",
+    "Greenmoustache",
     "zounic",
     "wfpearl",
     "ElitaSSJ4",
     "Matt+J",
     "Jack B Nimble",
-    "Melville Parrish",
-    "Lustre",
-    "bh",
     "Jwk0205",
-    "Marlon Daniels",
     "Starkselle",
-    "Aaron Bleuer",
-    "LacesOut!",
+    "Olive",
     "greebles",
     "Some Guy Named Barry",
     "Resist's Creations - Spicy Edition 🔥",
     "M Postkasse",
     "Wolffen",
+    "wamekukyouzin",
+    "drum matthieu",
     "Jacob Hoehler",
-    "FinalyFree",
+    "DogmaR34",
     "Matt Wenzel",
-    "Weasyl",
     "Lex Song",
-    "Cory Paza",
+    "Christopher Michel",
     "Gonzalo Andre Allendes Lopez",
+    "Serge Bekenkamp",
     "Jimmy Ledbetter",
-    "Luc Job",
+    "LeoZero",
     "Philip Hempel",
-    "corde",
     "nwalker94",
     "dan",
     "aai",
     "Tori",
+    "Mouthlessman",
     "Ran C",
     "ViperC",
-    "Sangheili460",
-    "MagnaInsomnia",
-    "Akira_HentAI",
-    "Karl P.",
     "Adam Taylor",
     "Weird_With_A_Beard",
-    "N/A",
     "The Spawn",
     "graysock",
     "Pozadine1",
@@ -162,7 +171,8 @@
     "AIGooner",
     "Luc",
     "ProtonPrince",
-    "Greenmoustache",
+    "DiffDuck",
+    "elu3199",
     "fancypants",
     "John+Edwards",
     "Joboshy",
@@ -172,42 +182,39 @@
     "contrite831",
     "Dan",
     "Bro Xie",
+    "yer fey",
     "batblue",
     "carey6409",
-    "Olive",
     "太郎 ゲーム",
+    "Roslynd",
     "jinxedx",
+    "Neco28",
+    "David Ortega",
     "AELOX",
     "Gooohokrbe",
     "Dankin-Pics",
     "Nicfit23",
     "Cristian Vazquez",
-    "wamekukyouzin",
     "OldBones",
-    "drum matthieu",
-    "Dogmaster",
     "Frank Nitty",
     "Magic Noob",
-    "Christopher Michel",
     "Zach Gonser",
-    "Serge Bekenkamp",
     "DougPeterson",
-    "LeoZero",
     "Antonio Pontes",
-    "nahinahi9",
+    "Bruce",
+    "kushiroK9",
     "Kevin John Duck",
     "Dustin Chen",
+    "Kevin Christopher",
     "Blackfish95",
-    "Mouthlessman",
     "Paul Kroll",
     "Penfore",
     "Bas Imagineer",
+    "John Statham",
     "Gordon Cole",
     "AbstractAss",
     "Dušan Ryban",
     "decoy",
-    "DiffDuck",
-    "elu3199",
     "Hasturkun",
     "Jon Sandman",
     "Ubivis",
@@ -222,34 +229,34 @@
     "MJG",
     "David LaVallee",
     "linnfrey",
+    "ae",
+    "Tr4shP4nda",
     "Jackthemind",
     "griffin+dahlberg",
     "jeaness",
     "takyamtom",
+    "Brian M",
     "Josef Lanzl",
     "Nerezza",
-    "yer fey",
+    "sanborondon",
     "Error_Rule34_Not_found",
     "aezin",
     "jcay015",
     "Erik Lopez",
-    "Roslynd",
     "Mateo Curić",
     "Geolog",
-    "Neco28",
     "Cosmosis",
     "Eris3D",
-    "David Ortega",
+    "m",
     "FloPro4Sho",
+    "Jamie Ogletree",
     "a _",
     "Jeff",
-    "Bruce",
     "Steven Owens",
     "James Coleman",
-    "Kevin Christopher",
     "Chad Idk",
     "dd",
-    "John Statham",
+    "Sam",
     "sjon kreutz",
     "yuxz69",
     "LarsesFPC",
@@ -257,8 +264,6 @@
     "esthe",
     "AlexDuKaNa",
     "地獄の禄",
-    "ae",
-    "Tr4shP4nda",
     "Gamalonia",
     "capn",
     "Joseph",
@@ -272,12 +277,16 @@
     "Hailshem",
     "Naomi Hale Danchi",
     "epicgamer0020690",
+    "Joshua Porrata",
+    "SuBu",
+    "RedPIXel",
+    "Wind",
     "IamAyam",
     "Andrew",
-    "Brian M",
     "Robert Wegemund",
-    "sanborondon",
-    "confiscated Zyra",
+    "Littlehuggy",
+    "Andrew Marshall",
+    "Brian Buie",
     "Taylor Funk",
     "Thought2Form",
     "Gerald Welly",
@@ -285,15 +294,19 @@
     "Sadlip",
     "Tee Gee",
     "tarek helmi",
+    "Joey Callahan",
     "Max Marklund",
-    "m",
+    "Mike Simone",
     "Pierce McBride",
     "Joshua Gray",
     "Pronredn",
     "Mikko Hemilä",
-    "Jamie Ogletree",
+    "Jacob McDaniel",
+    "X",
     "Temikus",
+    "Artokun",
     "Michael Taylor",
+    "Derek Baker",
     "lh qwe",
     "Martial",
     "conner",
@@ -305,24 +318,21 @@
     "Decx _",
     "Yuji Kaneko",
     "Rops Alot",
-    "Sam",
     "Ace Ventura",
     "四糸凜音",
     "Xeeosat",
     "Douglas Gaspar",
+    "Saya",
     "George",
     "dw",
+    "FrxzenSnxw",
     "WRL_SPR",
     "momokai",
     "몽타주",
     "kudari",
     "ken",
     "Crocket",
-    "Joshua Porrata",
     "keemun",
-    "SuBu",
-    "RedPIXel",
-    "Wind",
     "Nexus",
     "Ramneek“Guy”Ashok",
     "squid_actually",
@@ -337,37 +347,36 @@
     "KitKatM",
     "socrasteeze",
     "OrganicArtifact",
+    "ResidentDeviant",
     "MudkipMedkitz",
     "deanbrian",
     "Alex Wortman",
     "Cody",
     "emadsultan",
+    "InformedViewz",
+    "CHKeeho80",
+    "Bubbafett",
+    "leaf",
+    "Adam Rinehart",
+    "Pitpe11",
+    "TheD1rtyD03",
     "gzmzmvp",
     "Richard",
     "奚明 刘",
-    "Littlehuggy",
     "Aberr",
     "Gregory Kozhemiak",
     "준희 김",
-    "Brian Buie",
     "Eric Whitney",
-    "Joey Callahan",
     "Ivan Tadic",
     "Tomohiro Baba",
-    "Mike Simone",
     "Noora",
     "John J Linehan",
-    "Mattssn",
     "Elliot E",
     "Morgandel",
     "Theerat Jiramate",
     "Noah",
-    "Jacob McDaniel",
-    "X",
     "Sloan Steddy",
-    "Artokun",
     "hexxish",
-    "Derek Baker",
     "Steam Steam",
     "NICHOLAS BAXLEY",
     "CryptoTraderJK",
@@ -378,23 +387,14 @@
     "Fotek Design",
     "Nihongasuki",
     "MadSpin",
-    "FrxzenSnxw",
     "inbijiburu",
     "Nick “Loadstone” D",
     "starbugx",
     "dc7431",
-    "ResidentDeviant",
     "Ginnie",
     "Raku",
-    "InformedViewz",
-    "CHKeeho80",
-    "Bubbafett",
-    "leaf",
     "Vir",
     "Skyfire83",
-    "Adam Rinehart",
-    "Pitpe11",
-    "TheD1rtyD03",
     "moonpetal",
     "g9p0o",
     "Pkrsky",
@@ -403,6 +403,8 @@
     "SpringBootisTrash",
     "carsten",
     "ikok",
+    "quantenmecha",
+    "Jason+Nash",
     "DarkRoast",
     "Nasty+Hobbit",
     "letzte",
@@ -414,12 +416,15 @@
     "David Schenck",
     "Wolfe7D1",
     "Draven T",
+    "Time Valentine",
     "elleshar666",
     "ACTUALLY_the_Real_Willem_Dafoe",
     "Михал Михалыч",
+    "Matt",
     "Aquatic Coffee",
     "Kauffy",
     "ethanfel",
+    "SPJ",
     "Focuschannel",
     "Edward Kennedy",
     "Nick Kage",
@@ -432,12 +437,13 @@
     "notedfakes",
     "Michael Scott",
     "Pat Hen",
-    "Saya",
+    "Solixer",
     "Jordan Shaw",
     "Wes Sims",
     "Donor4115",
     "g unit",
     "Jimmy Borup",
+    "Manu Thetug",
     "Filippo Ferrari",
     "JC",
     "Prompt Pirate",
@@ -451,6 +457,11 @@
     "SomeDude",
     "nanana",
     "raf8osz",
+    "Bob+Barker",
+    "D",
+    "Dark_Pest",
+    "Eldithor",
+    "Alex",
     "Karru",
     "ChaChanoKo",
     "redcarrot",
@@ -467,36 +478,34 @@
     "Doug+Rintoul",
     "Noor",
     "Yorunai",
-    "quantenmecha",
-    "Jason+Nash",
     "cocona",
     "blikkies",
     "JBsuede",
-    "Time Valentine",
     "Shock Shockor",
     "りん あめ",
-    "Matt",
     "Goldwaters",
     "Zude",
+    "Joaquin Hierrezuelo",
     "Frogmilk",
-    "SPJ",
+    "Sean voets",
     "Kyler",
     "Kor",
+    "Joseph Hanson",
+    "John Rednoulf",
     "Bryan Rutkowski",
     "Justin Blaylock",
     "aRtFuL_DodGeR",
+    "Steven",
     "TenaciousD",
     "Dmitry Ryzhov",
     "Edward Ten Eyck",
     "Billy Gladky",
     "Probis",
-    "Solixer",
     "Pete Pain",
     "ItsGeneralButtNaked",
     "RHopkirk",
     "jinksta187",
     "robin.kok.",
-    "Manu Thetug",
     "Maxim",
     "Karlanx",
     "Lyavph",
@@ -504,6 +513,7 @@
     "Youguang",
     "andrewzpong",
     "BossGame",
+    "Marcus thronico",
     "lrdchs",
     "Tree Tagger",
     "Inversity",
@@ -511,6 +521,15 @@
     "Kevinj",
     "Mitchell Robson",
     "POPPIN",
+    "PoorStudent",
+    "Alex+Zaw",
+    "Supporter",
+    "ExLightSaber",
+    "Mobius2020",
+    "YaboiRay",
+    "Sildoren",
+    "Darv",
+    "Seon+Song",
     "2turbo",
     "Dmitry+Viznesenskiy",
     "tanjin90",
@@ -528,11 +547,6 @@
     "Inkognito",
     "G",
     "Tan+Huynh",
-    "Bob+Barker",
-    "D",
-    "Dark_Pest",
-    "Eldithor",
-    "Alex",
     "BillyBoy84",
     "Buecyb99",
     "Welkor",
@@ -545,28 +559,27 @@
     "G",
     "Ronan Delevacq",
     "Christian Schäfer",
+    "Leslie Andrew Ridings",
     "Dave Abraham",
-    "Joaquin Hierrezuelo",
     "Locrospiel",
-    "Sean voets",
     "Jarrid Lee",
     "Poophead27 Blyat",
-    "Joseph Hanson",
-    "John Rednoulf",
     "Kyron Mahan",
     "Mythspire",
     "Boba Smith",
     "TBitz33",
     "Anonym dkjglfleeoeldldldlkf",
     "MR.Bear",
+    "matt",
     "somethingtosay8",
     "Ezokewn",
+    "Terminuz",
     "ivistorm",
     "SendingRavens",
     "Sauv",
-    "Steven",
     "JackJohnnyJim",
     "Khánh Đặng",
+    "Borte",
     "Michael Docherty",
     "Ted Cart",
     "Sage Himeros",
@@ -574,6 +587,7 @@
     "Paul Hartsuyker",
     "elitassj",
     "Tigon",
+    "SkibidiRizzler",
     "Tania Nayelli Fernandez",
     "Draconach",
     "Jacob Winter",
@@ -581,6 +595,8 @@
     "Andrew Wilkinson",
     "David",
     "Meilo",
+    "Nacho Ferrando",
+    "Marcos Tortosa Carmona",
     "Dkom22",
     "shinonomeiro",
     "Snille",
@@ -589,7 +605,6 @@
     "xybrightsummer",
     "jreedatchison",
     "PhilW",
-    "Marcus thronico",
     "Janik",
     "Cruel",
     "MRBlack",
@@ -601,6 +616,13 @@
     "Scott",
     "Muratoraccio",
     "D",
+    "Somebody",
+    "Celestial+Kitten",
+    "TequiTequi",
+    "Homero+Banda",
+    "bakeliteboy",
+    "Nick",
+    "てぃんてぃんひーろー",
     "Gold_miner_ego",
     "IshouI;_;",
     "Monix",
@@ -620,17 +642,8 @@
     "you+halo9",
     "cloudghost",
     "Yongkwan+Lee",
-    "PoorStudent",
     "lucites",
-    "Alex+Zaw",
-    "Mobius2020",
-    "ExLightSaber",
-    "YaboiRay",
     "nickname",
-    "Sildoren",
-    "Darv",
-    "Seon+Song",
-    "Somebody",
     "Balut+Omelette",
     "eriick",
     "Lev+Lanevskiy",
@@ -651,37 +664,35 @@
     "Vinarus",
     "Josh Snyder",
     "ja s",
-    "Leslie Andrew Ridings",
     "Doug Mason",
     "scoreswazey",
+    "Oliverfish",
     "Owen Gwosdz",
     "Room Light",
     "Patryk Serious",
     "AZ Party Oasis",
-    "Devil Lude",
+    "Gentle Sartori",
     "Snorklebort",
     "David Murcko",
+    "vinter",
     "TheFusion",
     "Jack Dole",
-    "matt",
     "3zS4QNQ4",
-    "Terminuz",
     "max blo",
     "Matt M.",
     "Ivan Imes",
     "J M",
+    "Slacks",
     "Bouya shaka",
     "Jack Lawfield",
-    "Borte",
     "Maso",
+    "Homero Banda",
     "yyuvuvu",
-    "Eric Ketchum",
     "Nomki",
     "Kevin Wallace",
     "ChicRic",
     "BastardSama",
     "mercur",
-    "SkibidiRizzler",
     "Never_M",
     "Kalle Björk",
     "Yavizu3d",
@@ -689,9 +700,7 @@
     "Teriak47",
     "Just me",
     "Raf Stahelin",
-    "Nacho Ferrando",
     "Вячеслав Маринин",
-    "Marcos Tortosa Carmona",
     "Cola Matthew",
     "OniNoKen",
     "Iain Wisely",
@@ -734,6 +743,15 @@
     "SelfishMedic",
     "adderleighn",
     "EnragedAntelope",
+    "Brandon+G",
+    "fazefour33",
+    "plonk",
+    "Kotetsu",
+    "o",
+    "Tony+V",
+    "Anvil+G",
+    "draganjankovic1975dj528",
+    "MrSEIGE88",
     "yarsev",
     "M+Alsulaiti",
     "Mark+Staaf",
@@ -751,11 +769,6 @@
     "miduzza",
     "KB",
     "shw",
-    "Celestial+Kitten",
-    "bakeliteboy",
-    "TequiTequi",
-    "Homero+Banda",
-    "Nick",
     "Jim",
     "JoL",
     "YoruHime",
@@ -781,14 +794,14 @@
     "han b",
     "Nico",
     "Maximilian Krischan",
-    "Banana Joe",
+    "socialcat",
     "proto merp",
     "_ G3n",
     "Brandon Thomas",
     "Donovan Jenkins",
     "Hans Meier",
     "Dustin Hendel",
-    "sicarius",
+    "jboul",
     "Michael Eid",
     "Liberation",
     "Bob barker",
@@ -805,7 +818,6 @@
     "jumpd",
     "John C",
     "Rim",
-    "Oliverfish",
     "yfx507",
     "uruksayshi",
     "Jairus Knudsen",
@@ -814,24 +826,25 @@
     "nk8",
     "lylepaul",
     "Middo",
+    "Gary Chaboya",
     "Forbidden Atelier",
     "Thomas Sankowski",
     "DrB",
     "Nimhloth",
     "Adictedtohumping",
     "Moneymaker412K",
-    "vinter",
+    "Tsani Prodanov",
     "Towelie",
     "Jean-françois SEMA",
+    "Myrthrac",
+    "Taylor Dominy",
     "Andrew Ly",
-    "Slacks",
     "Glenn Hoetker",
     "john Greene",
     "Faburizu",
     "jimyjomson",
     "JaeHyun Jang",
     "Michael Hicks",
-    "Homero Banda",
     "Chase Kwon",
     "Bob Ling",
     "Inyoshu",
@@ -858,5 +871,5 @@
     "Somebody",
     "CK"
   ],
-  "totalCount": 855
+  "totalCount": 868
 }

locales/de.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "Voreinstellungsname...",
       "baseModel": "Basis-Modell",
       "baseModelSearchPlaceholder": "Basismodelle durchsuchen...",
-            "modelTags": "Tags (Top 20)",
+      "modelTags": "Tags",
       "modelTypes": "Modelltypen",
       "license": "Lizenz",
       "noCreditRequired": "Kein Credit erforderlich",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "Verkauf generierter Bilder erlauben",
       "noCreditRequiredTooltip": "Modell ohne Nennung des Erstellers verwenden",
       "noTags": "Keine Tags",
+      "tagSearchPlaceholder": "Tags durchsuchen...",
+      "noTagMatches": "Keine Tags entsprechen der aktuellen Suche.",
       "autoTags": "Auto-Tags",
       "noBaseModelMatches": "Keine Basismodelle entsprechen der aktuellen Suche.",
       "clearAll": "Alle Filter löschen",
@@ -640,7 +642,13 @@
       "preparing": "Download wird vorbereitet...",
       "connecting": "Verbindung zum Download-Server wird hergestellt...",
       "completed": "Abgeschlossen",
-            "downloadComplete": "Download erfolgreich abgeschlossen"
+      "downloadComplete": "Download erfolgreich abgeschlossen",
+      "enableCivarchiveApi": "CivArchive API als Metadaten-Anbieter aktivieren",
+      "enableCivarchiveApiHelp": "Wenn aktiviert, wird die CivArchive API als alternative Quelle für Modell-Metadaten verwendet (z. B. für von CivitAI gelöschte Modelle). Deaktivieren, um die Ratenbegrenzungen von CivArchive vollständig zu vermeiden.",
+      "providerOrder": "Reihenfolge der Metadaten-Anbieter",
+      "providerOrderHelp": "Die CivitAI API wird immer zuerst versucht. Wählen Sie die Reihenfolge der übrigen Anbieter bei der Metadatensuche.",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "App-Proxy aktivieren",

locales/en.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "Preset name...",
       "baseModel": "Base Model",
       "baseModelSearchPlaceholder": "Search base models...",
-      "modelTags": "Tags (Top 20)",
+      "modelTags": "Tags",
       "modelTypes": "Model Types",
       "license": "License",
       "noCreditRequired": "No Credit Required",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "Allow selling generated images",
       "noCreditRequiredTooltip": "Use the model without crediting the creator",
       "noTags": "No tags",
+      "tagSearchPlaceholder": "Search tags...",
+      "noTagMatches": "No tags match the current search.",
       "autoTags": "Auto Tags",
       "noBaseModelMatches": "No base models match the current search.",
       "clearAll": "Clear All Filters",
@@ -640,7 +642,13 @@
       "preparing": "Preparing download...",
       "connecting": "Connecting to download server...",
       "completed": "Completed",
-      "downloadComplete": "Download completed successfully"
+      "downloadComplete": "Download completed successfully",
+      "enableCivarchiveApi": "Enable CivArchive API as metadata provider",
+      "enableCivarchiveApiHelp": "When on, CivArchive API is used as a fallback source for model metadata (e.g. for models deleted from CivitAI). Turn off to avoid CivArchive rate limits entirely.",
+      "providerOrder": "Metadata provider fallback order",
+      "providerOrderHelp": "CivitAI API is always tried first. Choose the order of the remaining providers when looking up metadata.",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "Enable App-level Proxy",

locales/es.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "Nombre del preajuste...",
       "baseModel": "Modelo base",
       "baseModelSearchPlaceholder": "Buscar modelos base...",
-            "modelTags": "Etiquetas (Top 20)",
+      "modelTags": "Etiquetas",
       "modelTypes": "Tipos de modelos",
       "license": "Licencia",
       "noCreditRequired": "Sin crédito requerido",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "Permitir la venta de imágenes generadas",
       "noCreditRequiredTooltip": "Usar el modelo sin atribuir al creador",
       "noTags": "Sin etiquetas",
+      "tagSearchPlaceholder": "Buscar etiquetas...",
+      "noTagMatches": "Ninguna etiqueta coincide con la búsqueda actual.",
       "autoTags": "Etiquetas automáticas",
       "noBaseModelMatches": "Ningún modelo base coincide con la búsqueda actual.",
       "clearAll": "Limpiar todos los filtros",
@@ -640,7 +642,13 @@
       "preparing": "Preparando descarga...",
       "connecting": "Conectando al servidor de descarga...",
       "completed": "Completado",
-            "downloadComplete": "Descarga completada exitosamente"
+      "downloadComplete": "Descarga completada exitosamente",
+      "enableCivarchiveApi": "Habilitar CivArchive API como proveedor de metadatos",
+      "enableCivarchiveApiHelp": "Al activarlo, la API de CivArchive se usa como fuente alternativa de metadatos de modelos (p. ej. para modelos eliminados de CivitAI). Desactívelo para evitar por completo los límites de velocidad de CivArchive.",
+      "providerOrder": "Orden de proveedores de metadatos de respaldo",
+      "providerOrderHelp": "La API de CivitAI siempre se intenta primero. Elija el orden de los demás proveedores al buscar metadatos.",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "Habilitar proxy a nivel de aplicación",

locales/fr.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "Nom du préréglage...",
       "baseModel": "Modèle de base",
       "baseModelSearchPlaceholder": "Rechercher des modèles de base...",
-            "modelTags": "Tags (Top 20)",
+      "modelTags": "Tags",
       "modelTypes": "Types de modèles",
       "license": "Licence",
       "noCreditRequired": "Crédit non requis",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "Autoriser la vente d\"images générées",
       "noCreditRequiredTooltip": "Utiliser le modèle sans créditer le créateur",
       "noTags": "Aucun tag",
+      "tagSearchPlaceholder": "Rechercher des tags...",
+      "noTagMatches": "Aucun tag ne correspond à la recherche actuelle.",
       "autoTags": "Auto-Tags",
       "noBaseModelMatches": "Aucun modèle de base ne correspond à la recherche actuelle.",
       "clearAll": "Effacer tous les filtres",
@@ -640,7 +642,13 @@
       "preparing": "Préparation du téléchargement...",
       "connecting": "Connexion au serveur de téléchargement...",
       "completed": "Terminé",
-            "downloadComplete": "Téléchargement terminé avec succès"
+      "downloadComplete": "Téléchargement terminé avec succès",
+      "enableCivarchiveApi": "Activer l'API CivArchive comme fournisseur de métadonnées",
+      "enableCivarchiveApiHelp": "Lorsqu'elle est activée, l'API CivArchive est utilisée comme source de secours pour les métadonnées des modèles (par ex. pour les modèles supprimés de CivitAI). Désactivez pour éviter entièrement les limites de débit de CivArchive.",
+      "providerOrder": "Ordre de secours des fournisseurs de métadonnées",
+      "providerOrderHelp": "L'API CivitAI est toujours essayée en premier. Choisissez l'ordre des autres fournisseurs lors de la recherche de métadonnées.",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "Activer le proxy au niveau de l'application",

locales/he.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "שם קביעה מראש...",
       "baseModel": "מודל בסיס",
       "baseModelSearchPlaceholder": "חפש מודלי בסיס...",
-            "modelTags": "תגיות (20 המובילות)",
+      "modelTags": "תגיות",
       "modelTypes": "סוגי מודלים",
       "license": "רישיון",
       "noCreditRequired": "ללא קרדיט נדרש",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "אפשר מכירת תמונות שנוצרו",
       "noCreditRequiredTooltip": "שימוש במודל ללא מתן קרדיט ליוצר",
       "noTags": "ללא תגיות",
+      "tagSearchPlaceholder": "חיפוש תגיות...",
+      "noTagMatches": "אין תגיות שתואמות את החיפוש הנוכחי.",
       "autoTags": "תגיות אוטומטיות",
       "noBaseModelMatches": "אין מודלי בסיס התואמים לחיפוש הנוכחי.",
       "clearAll": "נקה את כל המסננים",
@@ -640,7 +642,13 @@
       "preparing": "מכין הורדה...",
       "connecting": "מתחבר לשרת ההורדות...",
       "completed": "הושלם",
-            "downloadComplete": "ההורדה הושלמה בהצלחה"
+      "downloadComplete": "ההורדה הושלמה בהצלחה",
+      "enableCivarchiveApi": "הפעל את CivArchive API כספק מטא-נתונים",
+      "enableCivarchiveApiHelp": "כאשר מופעל, CivArchive API משמש כמקור גיבוי למטא-נתונים של מודלים (למשל עבור מודלים שנמחקו מ-CivitAI). כבה כדי להימנע לחלוטין ממגבלות הקצב של CivArchive.",
+      "providerOrder": "סדר ספקי מטא-נתונים לגיבוי",
+      "providerOrderHelp": "CivitAI API תמיד מנוסה ראשון. בחר את סדר הספקים הנותרים בעת חיפוש מטא-נתונים.",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "הפעל פרוקסי ברמת האפליקציה",

locales/ja.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "プリセット名...",
       "baseModel": "ベースモデル",
       "baseModelSearchPlaceholder": "ベースモデルを検索...",
-            "modelTags": "タグ（上位20）",
+      "modelTags": "タグ",
       "modelTypes": "モデルタイプ",
       "license": "ライセンス",
       "noCreditRequired": "クレジット不要",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "生成した画像の販売を許可",
       "noCreditRequiredTooltip": "クレジット表記なしでモデルを使用可能",
       "noTags": "タグなし",
+      "tagSearchPlaceholder": "タグを検索...",
+      "noTagMatches": "現在の検索に一致するタグはありません。",
       "autoTags": "自動タグ",
       "noBaseModelMatches": "現在の検索に一致するベースモデルはありません。",
       "clearAll": "すべてのフィルタをクリア",
@@ -640,7 +642,13 @@
       "preparing": "ダウンロードを準備中...",
       "connecting": "ダウンロードサーバーに接続中...",
       "completed": "完了",
-            "downloadComplete": "ダウンロードが正常に完了しました"
+      "downloadComplete": "ダウンロードが正常に完了しました",
+      "enableCivarchiveApi": "CivArchive API をメタデータプロバイダーとして有効化",
+      "enableCivarchiveApiHelp": "有効にすると、CivArchive API がモデルメタデータの代替ソースとして使用されます（例：CivitAI から削除されたモデルの場合）。オフにすると、CivArchive のレート制限を完全に回避できます。",
+      "providerOrder": "メタデータプロバイダーのフォールバック順序",
+      "providerOrderHelp": "CivitAI API が常に最初に試行されます。メタデータ検索時の残りのプロバイダーの順序を選択してください。",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "アプリレベルのプロキシを有効化",

locales/ko.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "프리셋 이름...",
       "baseModel": "베이스 모델",
       "baseModelSearchPlaceholder": "베이스 모델 검색...",
-            "modelTags": "태그 (상위 20개)",
+      "modelTags": "태그",
       "modelTypes": "모델 유형",
       "license": "라이선스",
       "noCreditRequired": "크레딧 표기 없음",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "생성된 이미지 판매 허용",
       "noCreditRequiredTooltip": "크리에이터 저작자 표시 없이 모델 사용 가능",
       "noTags": "태그 없음",
+      "tagSearchPlaceholder": "태그 검색...",
+      "noTagMatches": "현재 검색과 일치하는 태그가 없습니다.",
       "autoTags": "자동 태그",
       "noBaseModelMatches": "현재 검색과 일치하는 베이스 모델이 없습니다.",
       "clearAll": "모든 필터 지우기",
@@ -640,7 +642,13 @@
       "preparing": "다운로드 준비 중...",
       "connecting": "다운로드 서버에 연결 중...",
       "completed": "완료됨",
-            "downloadComplete": "다운로드가 성공적으로 완료되었습니다"
+      "downloadComplete": "다운로드가 성공적으로 완료되었습니다",
+      "enableCivarchiveApi": "CivArchive API를 메타데이터 제공자로 활성화",
+      "enableCivarchiveApiHelp": "활성화하면 CivArchive API가 모델 메타데이터의 대체 소스로 사용됩니다 (예: CivitAI에서 삭제된 모델의 경우). 비활성화하면 CivArchive의 속도 제한을 완전히 피할 수 있습니다.",
+      "providerOrder": "메타데이터 제공자 폴백 순서",
+      "providerOrderHelp": "CivitAI API가 항상 먼저 시도됩니다. 메타데이터 조회 시 나머지 제공자의 순서를 선택하세요.",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "앱 수준 프록시 활성화",

locales/ru.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "Имя пресета...",
       "baseModel": "Базовая модель",
       "baseModelSearchPlaceholder": "Поиск базовых моделей...",
-            "modelTags": "Теги (Топ 20)",
+      "modelTags": "Теги",
       "modelTypes": "Типы моделей",
       "license": "Лицензия",
       "noCreditRequired": "Без указания авторства",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "Разрешить продажу сгенерированных изображений",
       "noCreditRequiredTooltip": "Использование модели без указания автора",
       "noTags": "Без тегов",
+      "tagSearchPlaceholder": "Поиск тегов...",
+      "noTagMatches": "Нет тегов, соответствующих текущему поиску.",
       "autoTags": "Авто-теги",
       "noBaseModelMatches": "Нет базовых моделей, соответствующих текущему поиску.",
       "clearAll": "Очистить все фильтры",
@@ -640,7 +642,13 @@
       "preparing": "Подготовка к загрузке...",
       "connecting": "Подключение к серверу загрузки...",
       "completed": "Завершено",
-            "downloadComplete": "Загрузка успешно завершена"
+      "downloadComplete": "Загрузка успешно завершена",
+      "enableCivarchiveApi": "Включить CivArchive API как источник метаданных",
+      "enableCivarchiveApiHelp": "При включении CivArchive API используется как резервный источник метаданных моделей (например, для моделей, удалённых с CivitAI). Отключите, чтобы полностью избежать ограничений скорости CivArchive.",
+      "providerOrder": "Порядок резервных источников метаданных",
+      "providerOrderHelp": "CivitAI API всегда проверяется первым. Выберите порядок остальных источников при поиске метаданных.",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "Включить прокси на уровне приложения",

locales/zh-CN.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "预设名称...",
       "baseModel": "基础模型",
       "baseModelSearchPlaceholder": "搜索基础模型...",
-            "modelTags": "标签（前20）",
+      "modelTags": "标签",
       "modelTypes": "模型类型",
       "license": "许可证",
       "noCreditRequired": "无需署名",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "允许出售生成的图片",
       "noCreditRequiredTooltip": "使用模型时无需注明原作者",
       "noTags": "无标签",
+      "tagSearchPlaceholder": "搜索标签...",
+      "noTagMatches": "没有匹配当前搜索的标签。",
       "autoTags": "自动标签",
       "noBaseModelMatches": "没有基础模型符合当前搜索。",
       "clearAll": "清除所有筛选",
@@ -640,7 +642,13 @@
       "preparing": "正在准备下载...",
       "connecting": "正在连接下载服务器...",
       "completed": "已完成",
-            "downloadComplete": "下载成功完成"
+      "downloadComplete": "下载成功完成",
+      "enableCivarchiveApi": "启用 CivArchive API 作为元数据提供者",
+      "enableCivarchiveApiHelp": "开启后，CivArchive API 将作为模型元数据的备用来源（例如用于已从 CivitAI 删除的模型）。关闭可完全避免 CivArchive 的速率限制。",
+      "providerOrder": "元数据提供者回退顺序",
+      "providerOrderHelp": "CivitAI API 始终优先尝试。选择查找元数据时其余提供者的顺序。",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "启用应用级代理",

locales/zh-TW.json

@@ -233,7 +233,7 @@
       "presetNamePlaceholder": "預設名稱...",
       "baseModel": "基礎模型",
       "baseModelSearchPlaceholder": "搜尋基礎模型...",
-            "modelTags": "標籤（前 20）",
+      "modelTags": "標籤",
       "modelTypes": "模型類型",
       "license": "授權",
       "noCreditRequired": "無需署名",
@@ -241,6 +241,8 @@
       "allowSellingGeneratedContentTooltip": "允許出售生成的圖片",
       "noCreditRequiredTooltip": "使用模型時無需註明原作者",
       "noTags": "無標籤",
+      "tagSearchPlaceholder": "搜尋標籤...",
+      "noTagMatches": "沒有符合目前搜尋的標籤。",
       "autoTags": "自動標籤",
       "noBaseModelMatches": "沒有基礎模型符合目前的搜尋。",
       "clearAll": "清除所有篩選",
@@ -640,7 +642,13 @@
       "preparing": "準備下載中...",
       "connecting": "正在連接下載伺服器...",
       "completed": "已完成",
-            "downloadComplete": "下載成功完成"
+      "downloadComplete": "下載成功完成",
+      "enableCivarchiveApi": "啟用 CivArchive API 作為中繼資料提供者",
+      "enableCivarchiveApiHelp": "開啟後，CivArchive API 將作為模型中繼資料的備用來源（例如用於已從 CivitAI 刪除的模型）。關閉可完全避免 CivArchive 的速率限制。",
+      "providerOrder": "中繼資料提供者回退順序",
+      "providerOrderHelp": "CivitAI API 始終優先嘗試。選擇查詢中繼資料時其餘提供者的順序。",
+      "providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
+      "providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
     },
     "proxySettings": {
       "enableProxy": "啟用應用程式代理",

py/routes/handlers/misc_handlers.py

@@ -1570,7 +1570,11 @@ class SettingsHandler:
                 else:
                     self._settings.set(key, value)
 
-                if key == "enable_metadata_archive_db":
+                if key in (
+                    "enable_metadata_archive_db",
+                    "enable_civarchive_api",
+                    "metadata_provider_order",
+                ):
                     await self._metadata_provider_updater()
 
                 if key in self._PROXY_KEYS:

py/routes/handlers/model_handlers.py

@@ -973,6 +973,8 @@ class ModelQueryHandler:
             limit = int(request.query.get("limit", "20"))
             if limit < 0:
                 limit = 20
+            elif limit > 200:
+                limit = 20
             top_tags = await self._service.get_top_tags(limit)
             return web.json_response({"success": True, "tags": top_tags})
         except Exception as exc:
@@ -981,6 +983,22 @@ class ModelQueryHandler:
                 {"success": False, "error": "Internal server error"}, status=500
             )
 
+    async def search_tags(self, request: web.Request) -> web.Response:
+        try:
+            query = request.query.get("q", "")
+            limit = int(request.query.get("limit", "20"))
+            if limit < 0:
+                limit = 20
+            elif limit > 200:
+                limit = 20
+            tags = await self._service.search_tags(query, limit)
+            return web.json_response({"success": True, "tags": tags})
+        except Exception as exc:
+            self._logger.error("Error searching tags: %s", exc, exc_info=True)
+            return web.json_response(
+                {"success": False, "error": "Internal server error"}, status=500
+            )
+
     async def get_base_models(self, request: web.Request) -> web.Response:
         try:
             limit = int(request.query.get("limit", "20"))
@@ -2947,6 +2965,7 @@ class ModelHandlerSet:
             "bulk_delete_models": self.management.bulk_delete_models,
             "verify_duplicates": self.management.verify_duplicates,
             "get_top_tags": self.query.get_top_tags,
+            "search_tags": self.query.search_tags,
             "get_base_models": self.query.get_base_models,
             "get_model_types": self.query.get_model_types,
             "scan_models": self.query.scan_models,

py/routes/handlers/recipe_handlers.py

@@ -72,6 +72,7 @@ class RecipeHandlerSet:
             "save_recipe": self.management.save_recipe,
             "delete_recipe": self.management.delete_recipe,
             "get_top_tags": self.query.get_top_tags,
+            "search_tags": self.query.search_tags,
             "get_base_models": self.query.get_base_models,
             "get_roots": self.query.get_roots,
             "get_folders": self.query.get_folders,
@@ -317,12 +318,11 @@ class RecipeQueryHandler:
                 raise RuntimeError("Recipe scanner unavailable")
 
             limit = int(request.query.get("limit", "20"))
-            cache = await recipe_scanner.get_cached_data()
-
-            tag_counts: Dict[str, int] = {}
-            for recipe in getattr(cache, "raw_data", []):
-                for tag in recipe.get("tags", []) or []:
-                    tag_counts[tag] = tag_counts.get(tag, 0) + 1
+            if limit < 0:
+                limit = 20
+            elif limit > 200:
+                limit = 20
+            tag_counts = await self._get_recipe_tag_counts(recipe_scanner)
 
             sorted_tags = [
                 {"tag": tag, "count": count} for tag, count in tag_counts.items()
@@ -333,6 +333,55 @@ class RecipeQueryHandler:
             self._logger.error("Error retrieving top tags: %s", exc, exc_info=True)
             return web.json_response({"success": False, "error": str(exc)}, status=500)
 
+    async def search_tags(self, request: web.Request) -> web.Response:
+        try:
+            await self._ensure_dependencies_ready()
+            recipe_scanner = self._recipe_scanner_getter()
+            if recipe_scanner is None:
+                raise RuntimeError("Recipe scanner unavailable")
+
+            query = request.query.get("q", "")
+            limit = int(request.query.get("limit", "20"))
+            if limit < 0:
+                limit = 20
+            elif limit > 200:
+                limit = 20
+
+            tag_counts = await self._get_recipe_tag_counts(recipe_scanner)
+            normalized_query = (query or "").strip().lower()
+            if not normalized_query:
+                sorted_tags = [
+                    {"tag": tag, "count": count} for tag, count in tag_counts.items()
+                ]
+                sorted_tags.sort(key=lambda entry: entry["count"], reverse=True)
+                return web.json_response(
+                    {"success": True, "tags": sorted_tags[: (limit if limit > 0 else 20)]}
+                )
+
+            matched = [
+                {"tag": tag, "count": count}
+                for tag, count in tag_counts.items()
+                if normalized_query in tag.lower()
+            ]
+            matched.sort(key=lambda entry: entry["count"], reverse=True)
+            if limit == 0:
+                result = matched
+            else:
+                result = matched[:limit]
+            return web.json_response({"success": True, "tags": result})
+        except Exception as exc:
+            self._logger.error("Error searching recipe tags: %s", exc, exc_info=True)
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+
+    async def _get_recipe_tag_counts(self, recipe_scanner) -> Dict[str, int]:
+        """Compute tag->count mapping from cached recipe data."""
+        cache = await recipe_scanner.get_cached_data()
+        tag_counts: Dict[str, int] = {}
+        for recipe in getattr(cache, "raw_data", []):
+            for tag in recipe.get("tags", []) or []:
+                tag_counts[tag] = tag_counts.get(tag, 0) + 1
+        return tag_counts
+
     async def get_base_models(self, request: web.Request) -> web.Response:
         try:
             await self._ensure_dependencies_ready()

py/routes/model_route_registrar.py

@@ -46,6 +46,7 @@ COMMON_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
         "GET", "/api/lm/{prefix}/auto-organize-progress", "get_auto_organize_progress"
     ),
     RouteDefinition("GET", "/api/lm/{prefix}/top-tags", "get_top_tags"),
+    RouteDefinition("GET", "/api/lm/{prefix}/search-tags", "search_tags"),
     RouteDefinition("GET", "/api/lm/{prefix}/base-models", "get_base_models"),
     RouteDefinition("GET", "/api/lm/{prefix}/model-types", "get_model_types"),
     RouteDefinition("GET", "/api/lm/{prefix}/scan", "scan_models"),

py/routes/recipe_route_registrar.py

@@ -29,6 +29,7 @@ ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
     RouteDefinition("POST", "/api/lm/recipes/save", "save_recipe"),
     RouteDefinition("DELETE", "/api/lm/recipe/{recipe_id}", "delete_recipe"),
     RouteDefinition("GET", "/api/lm/recipes/top-tags", "get_top_tags"),
+    RouteDefinition("GET", "/api/lm/recipes/search-tags", "search_tags"),
     RouteDefinition("GET", "/api/lm/recipes/base-models", "get_base_models"),
     RouteDefinition("GET", "/api/lm/recipes/roots", "get_roots"),
     RouteDefinition("GET", "/api/lm/recipes/folders", "get_folders"),

py/services/base_model_service.py

@@ -804,6 +804,12 @@ class BaseModelService(ABC):
         """Get top tags sorted by frequency"""
         return await self.scanner.get_top_tags(limit)
 
+    async def search_tags(
+        self, query: str, limit: int = 50
+    ) -> List[Dict]:
+        """Search tags by substring, sorted by frequency"""
+        return await self.scanner.search_tags(query, limit)
+
     async def get_base_models(self, limit: int = 20) -> List[Dict]:
         """Get base models sorted by frequency"""
         return await self.scanner.get_base_models(limit)
@@ -1092,6 +1098,11 @@ class BaseModelService(ABC):
 
         Listing/search endpoints return lightweight cache entries; this method performs
         a lazy read of the on-disk metadata snapshot when callers need full detail.
+
+        As a beneficial side effect, the in-memory and persistent caches are
+        opportunistically synchronised with the on-disk metadata — this keeps the
+        caches fresh even when a ``.metadata.json`` file was edited outside of the
+        normal save path (e.g. manually or by an external script).
         """
         metadata, should_skip = await MetadataManager.load_metadata(
             file_path, self.metadata_class
@@ -1109,6 +1120,19 @@ class BaseModelService(ABC):
                 MetadataManager.save_metadata(file_path, metadata)
             )
 
+        # Opportunistically sync the in-memory + persistent caches.
+        # The .metadata.json disk read is already paid for; the sync only
+        # performs work when the cache is actually stale, and uses targeted,
+        # in-place operations to minimise overhead even with large model sets.
+        #
+        # Fire-and-forget by design: the task is intentionally untracked.
+        # sync_cache_from_metadata handles its own errors internally.
+        asyncio.create_task(
+            self.scanner.sync_cache_from_metadata(
+                file_path, metadata.to_dict()
+            )
+        )
+
         return self.filter_civitai_data(metadata.to_dict().get("civitai", {}))
 
     async def get_model_description(self, file_path: str) -> Optional[str]:

py/services/checkpoint_scanner.py

@@ -114,6 +114,13 @@ class CheckpointScanner(ModelScanner):
                 and metadata.hash_status == "completed"
                 and metadata.sha256
             ):
+                # Ensure the in-memory hash index is populated even when
+                # the hash was already computed and persisted to the metadata
+                # file.  Without this, usage tracking (and any other caller
+                # that queries get_hash_by_filename first) will miss on every
+                # lookup and keep calling back into this method, creating a
+                # tight loop that never populates the index.
+                self._hash_index.add_entry(metadata.sha256.lower(), file_path)
                 return metadata.sha256
 
             async with self._hash_calculation_lock:
@@ -125,6 +132,7 @@ class CheckpointScanner(ModelScanner):
                     and metadata.hash_status == "completed"
                     and metadata.sha256
                 ):
+                    self._hash_index.add_entry(metadata.sha256.lower(), file_path)
                     return metadata.sha256
 
                 task = self._hash_calculation_tasks.get(real_path)
@@ -175,6 +183,9 @@ class CheckpointScanner(ModelScanner):
 
             # Check if hash is already calculated
             if metadata.hash_status == "completed" and metadata.sha256:
+                # Populate the in-memory hash index even for pre-computed
+                # hashes, mirroring the fix in calculate_hash_for_model.
+                self._hash_index.add_entry(metadata.sha256.lower(), file_path)
                 return metadata.sha256
 
             # Update status to calculating
@@ -193,6 +204,20 @@ class CheckpointScanner(ModelScanner):
             # Update hash index
             self._hash_index.add_entry(sha256.lower(), file_path)
 
+            # Update the in-memory cache entry so that subsequent
+            # _persist_current_cache / _save_persistent_cache calls
+            # write the hash back to the SQLite models table.  Without
+            # this the hash only lives in the metadata file and the
+            # in-memory hash index, both of which are lost across
+            # restarts, causing the same re-computation loop on the
+            # next session.
+            if self._cache is not None and self._cache.raw_data:
+                for entry in self._cache.raw_data:
+                    if entry.get("file_path") == file_path:
+                        entry["sha256"] = sha256.lower()
+                        entry["hash_status"] = "completed"
+                        break
+
             logger.info(f"Hash calculated for checkpoint: {file_path}")
             return sha256
 

py/services/metadata_service.py

@@ -15,6 +15,17 @@ from .service_registry import ServiceRegistry
 
 logger = logging.getLogger(__name__)
 
+_PROVIDER_DISPLAY_NAMES = {
+    "civitai_api": "CivitAI",
+    "civarchive_api": "CivArchive",
+    "sqlite": "Archive DB",
+}
+
+_PRESET_PROVIDER_ORDERS = {
+    "civitai_archive_sqlite": ["civitai_api", "civarchive_api", "sqlite"],
+    "civitai_sqlite_archive": ["civitai_api", "sqlite", "civarchive_api"],
+}
+
 async def initialize_metadata_providers():
     """Initialize and configure all metadata providers based on settings"""
     provider_manager = await ModelMetadataProviderManager.get_instance()
@@ -26,6 +37,8 @@ async def initialize_metadata_providers():
     # Get settings
     settings_manager = get_settings_manager()
     enable_archive_db = settings_manager.get('enable_metadata_archive_db', False)
+    enable_civarchive_api = settings_manager.get('enable_civarchive_api', True)
+    provider_order = settings_manager.get('metadata_provider_order', 'civitai_archive_sqlite')
 
     providers = []
     
@@ -59,7 +72,11 @@ async def initialize_metadata_providers():
     except Exception as e:
         logger.error(f"Failed to initialize Civitai API metadata provider: {e}")
 
-    # Register CivArchive provider, and all add to fallback providers
+    # Register CivArchive provider when enabled. Civitai API is always
+    # preferred (better metadata); CivArchive mainly recovers metadata for
+    # models deleted from Civitai, so it can be turned off to avoid its long
+    # rate-limit windows entirely.
+    if enable_civarchive_api:
         try:
             civarchive_client = await ServiceRegistry.get_civarchive_client()
             civarchive_provider = CivArchiveModelMetadataProvider(civarchive_client)
@@ -68,18 +85,35 @@ async def initialize_metadata_providers():
             logger.debug("CivArchive metadata provider registered (also included in fallback)")
         except Exception as e:
             logger.error(f"Failed to initialize CivArchive metadata provider: {e}")
+    else:
+        logger.debug("CivArchive metadata provider disabled by setting 'enable_civarchive_api'")
+
+    # Preset fallback orderings (see module-level _PRESET_PROVIDER_ORDERS).
+    # civitai_api is always first (better metadata); the remaining providers
+    # are arranged by the configured preset.  Providers that are not
+    # registered (disabled/unavailable) are simply skipped, so each preset
+    # degrades gracefully.
+    desired_order = _PRESET_PROVIDER_ORDERS.get(
+        provider_order, _PRESET_PROVIDER_ORDERS["civitai_archive_sqlite"]
+    )
 
     # Set up fallback provider based on available providers
     if len(providers) > 1:
-        # Always use Civitai API (it has better metadata), then CivArchive API, then Archive DB
         ordered_providers: list[tuple[str, ModelMetadataProvider]] = []
-        ordered_providers.extend([p for p in providers if p[0] == 'civitai_api'])
-        ordered_providers.extend([p for p in providers if p[0] == 'civarchive_api'])
-        ordered_providers.extend([p for p in providers if p[0] == 'sqlite'])
+        for name in desired_order:
+            ordered_providers.extend([p for p in providers if p[0] == name])
+        # Include any provider not covered by the preset (defensive) at the end
+        for p in providers:
+            if p not in ordered_providers:
+                ordered_providers.append(p)
 
         if ordered_providers:
             fallback_provider = FallbackMetadataProvider(ordered_providers)
             provider_manager.register_provider('fallback', fallback_provider, is_default=True)
+            logger.debug(
+                "Metadata fallback provider order: %s",
+                ", ".join(name for name, _ in ordered_providers),
+            )
     elif len(providers) == 1:
         # Only one provider available, set it as default
         provider_name, provider = providers[0]
@@ -96,11 +130,30 @@ async def update_metadata_providers():
         # Get current settings
         settings_manager = get_settings_manager()
         enable_archive_db = settings_manager.get('enable_metadata_archive_db', False)
+        enable_civarchive_api = settings_manager.get('enable_civarchive_api', True)
+        provider_order = settings_manager.get('metadata_provider_order', 'civitai_archive_sqlite')
         
         # Reinitialize all providers with new settings
         provider_manager = await initialize_metadata_providers()
         
-        logger.info(f"Updated metadata providers, archive_db enabled: {enable_archive_db}")
+        # Build effective provider chain for logging (use actually-registered
+        # providers, not just settings, so a failed init is reflected correctly)
+        registered = set(provider_manager.providers.keys())
+        desired = _PRESET_PROVIDER_ORDERS.get(
+            provider_order, _PRESET_PROVIDER_ORDERS["civitai_archive_sqlite"]
+        )
+        chain = " → ".join(
+            _PROVIDER_DISPLAY_NAMES[p]
+            for p in desired
+            if p in registered and p in _PROVIDER_DISPLAY_NAMES
+        )
+        
+        logger.info(
+            "Updated metadata providers: archive_db=%s, civarchive_api=%s, chain=%s",
+            enable_archive_db,
+            enable_civarchive_api,
+            chain,
+        )
         return provider_manager
     except Exception as e:
         logger.error(f"Failed to update metadata providers: {e}")

py/services/model_scanner.py

@@ -1566,6 +1566,218 @@ class ModelScanner:
 
         return cache_entry if metadata else True
         
+    async def sync_cache_from_metadata(
+        self, file_path: str, metadata_dict: Dict[str, Any]
+    ) -> bool:
+        """Opportunistically sync in-memory and persistent caches from metadata.
+
+        Builds a prospective cache entry from *metadata_dict* (deserialized
+        ``.metadata.json`` content) and compares it against the current cache
+        entry.  When the two are already identical this method returns
+        ``False`` without touching anything — avoiding the overhead of
+        ``update_single_model_cache``, which always removes and re-inserts
+        the entry, triggers a full resort, and persists via the heavyweight
+        ``save_cache()``.
+
+        When differences are detected the update is applied **in-place** with
+        targeted operations:
+
+        * The existing ``raw_data`` entry is modified rather than removed and
+          re-appended (O(1) instead of O(n)).
+        * Tag counts and the hash index are updated incrementally.
+        * The version index is rebuilt only for the affected entry.
+        * ``resort()`` is called **only** when a sort-relevant field changed
+          (``model_name`` / ``file_name`` for name-sort, ``modified`` for
+          date-sort, ``size`` for size-sort).
+        * The persistent (SQLite) cache receives a targeted single-row update
+          via :meth:`PersistentModelCache.update_single_model` rather than a
+          full-table ``save_cache()``.
+
+        Returns:
+            ``True`` if any cache update was performed, ``False`` if the
+            caches were already in sync.
+
+        .. note::
+
+            This is a **best-effort** operation.  Failures are logged but
+            never propagated — callers should fire-and-forget via
+            :func:`asyncio.create_task`.
+        """
+        try:
+            return await self._sync_cache_from_metadata_impl(
+                file_path, metadata_dict
+            )
+        except Exception:
+            logger.warning(
+                "sync_cache_from_metadata failed for %s",
+                file_path,
+                exc_info=True,
+            )
+            return False
+
+    async def _sync_cache_from_metadata_impl(
+        self, file_path: str, metadata_dict: Dict[str, Any]
+    ) -> bool:
+        cache = await self.get_cached_data()
+
+        # Locate the existing cache entry -----------------------------------
+        existing_idx: Optional[int] = None
+        existing_entry: Optional[Dict[str, Any]] = None
+        for i, item in enumerate(cache.raw_data):
+            if item.get("file_path") == file_path:
+                existing_entry = item
+                existing_idx = i
+                break
+
+        # Build the desired entry from metadata ------------------------------
+        folder_value = (
+            existing_entry.get("folder", "")
+            if existing_entry
+            else self._calculate_folder(file_path)
+        )
+        desired_entry = self._build_cache_entry(
+            metadata_dict,
+            folder=folder_value,
+            file_path_override=file_path,
+        )
+
+        # Ensure sha256 is populated (defensive — metadata should have it)
+        if (
+            not desired_entry.get("sha256")
+            and file_path
+            and os.path.exists(file_path)
+        ):
+            try:
+                sha256 = await calculate_sha256(file_path)
+                if sha256:
+                    desired_entry["sha256"] = sha256.lower()
+            except Exception:
+                pass
+
+        # Not in cache at all — delegate to the full update path ------------
+        if existing_entry is None:
+            result = await self.update_single_model_cache(
+                file_path, file_path, metadata_dict
+            )
+            return bool(result)
+
+        # Compare — skip everything if already in sync -----------------------
+        if not self._cache_entries_differ(existing_entry, desired_entry):
+            return False
+
+        # Re-validate: the cache may have been replaced concurrently
+        # (e.g. by _apply_scan_result).  Use identity check, not equality,
+        # so we detect when the raw_data list was swapped out from under us.
+        if self._cache is None or not any(
+            item is existing_entry for item in self._cache.raw_data
+        ):
+            return False
+
+        # ---- Differences detected: apply targeted, in-place updates --------
+
+        # Snapshot old values for delta computations
+        old_tags = list(existing_entry.get("tags") or [])
+        old_sha256: str = existing_entry.get("sha256", "") or ""
+        old_model_name: str = existing_entry.get("model_name", "") or ""
+        old_file_name: str = existing_entry.get("file_name", "") or ""
+        old_modified: float = float(existing_entry.get("modified", 0.0) or 0.0)
+        old_size: int = int(existing_entry.get("size", 0) or 0)
+        old_civitai = existing_entry.get("civitai")
+
+        # ---- In-place update of the cache entry ----
+        existing_entry.clear()
+        existing_entry.update(desired_entry)
+
+        # ---- Incremental tag count update ----
+        new_tags: set = set(desired_entry.get("tags") or [])
+        old_tag_set: set = set(old_tags)
+        for tag in old_tag_set - new_tags:
+            current = self._tags_count.get(tag, 0)
+            if current <= 1:
+                self._tags_count.pop(tag, None)
+            else:
+                self._tags_count[tag] = current - 1
+        for tag in new_tags - old_tag_set:
+            self._tags_count[tag] = self._tags_count.get(tag, 0) + 1
+
+        # ---- Incremental hash index update ----
+        new_sha = (desired_entry.get("sha256", "") or "").lower()
+        old_sha = (old_sha256 or "").lower()
+        if new_sha != old_sha:
+            if old_sha:
+                self._hash_index.remove_by_path(file_path)
+            if new_sha:
+                self._hash_index.add_entry(new_sha, file_path)
+
+        # ---- Incremental version index update ----
+        new_civitai = desired_entry.get("civitai")
+        if old_civitai != new_civitai:
+            temp_old = {
+                "file_path": file_path,
+                "file_name": old_file_name,
+                "civitai": old_civitai,
+            }
+            cache.remove_from_version_index(temp_old)
+            cache.add_to_version_index(existing_entry)
+
+        # ---- Conditional resort (only when sort-key fields changed) ----
+        need_resort = False
+        _last = cache._last_sort
+        sort_key: Optional[str] = _last[0] if _last != (None, None) else None
+        if sort_key == "name":
+            if (
+                old_model_name != desired_entry.get("model_name", "")
+                or old_file_name != desired_entry.get("file_name", "")
+            ):
+                need_resort = True
+        elif sort_key == "date":
+            if old_modified != float(desired_entry.get("modified", 0.0) or 0.0):
+                need_resort = True
+        elif sort_key == "size":
+            if old_size != int(desired_entry.get("size", 0) or 0):
+                need_resort = True
+
+        if need_resort:
+            await cache.resort()
+
+        # ---- Targeted SQL update (single row, not full save_cache) ----
+        persistent = getattr(self, "_persistent_cache", None)
+        if persistent is not None:
+            old_item_for_sql: Dict[str, Any] = {
+                "file_path": file_path,
+                "tags": old_tags,
+                "sha256": old_sha256,
+            }
+            await asyncio.get_event_loop().run_in_executor(
+                None,
+                persistent.update_single_model,
+                self.model_type,
+                desired_entry,
+                old_item_for_sql,
+            )
+
+        return True
+
+    @staticmethod
+    def _cache_entries_differ(a: Dict[str, Any], b: Dict[str, Any]) -> bool:
+        """Return ``True`` when two cache-entry dicts differ in any field.
+
+        Tag lists are compared order-insensitively; all other keys use
+        standard equality.
+        """
+        a_tags = sorted(a.get("tags") or [])
+        b_tags = sorted(b.get("tags") or [])
+        if a_tags != b_tags:
+            return True
+
+        all_keys = set(a.keys()) | set(b.keys())
+        for key in all_keys:
+            if key == "tags":
+                continue
+            if a.get(key) != b.get(key):
+                return True
+        return False
+
     def has_hash(self, sha256: str) -> bool:
         """Check if a model with given hash exists"""
         return self._hash_index.has_hash(sha256.lower())
@@ -1619,6 +1831,31 @@ class ModelScanner:
             return sorted_tags
         return sorted_tags[:limit]
 
+    async def search_tags(
+        self, query: str, limit: int = 50
+    ) -> List[Dict[str, any]]:
+        """Search tags by case-insensitive substring match, sorted by count.
+
+        If query is empty, behaves like get_top_tags (returns top ``limit``
+        tags). If limit is 0, all matching tags are returned.
+        """
+        await self.get_cached_data()
+
+        normalized_query = (query or "").strip().lower()
+        if not normalized_query:
+            return await self.get_top_tags(limit if limit > 0 else 20)
+
+        matched = [
+            {"tag": tag, "count": count}
+            for tag, count in self._tags_count.items()
+            if normalized_query in tag.lower()
+        ]
+        matched.sort(key=lambda x: x["count"], reverse=True)
+
+        if limit == 0:
+            return matched
+        return matched[:limit]
+
     async def get_base_models(self, limit: int = 20) -> List[Dict[str, any]]:
         """Get base models sorted by count. If limit is 0, return all."""
         cache = await self.get_cached_data()

py/services/persistent_model_cache.py

@@ -587,6 +587,95 @@ class PersistentModelCache:
         placeholders = ", ".join(["?"] * len(self._MODEL_COLUMNS))
         return f"INSERT INTO models ({columns}) VALUES ({placeholders})"
 
+    def update_single_model(
+        self,
+        model_type: str,
+        new_item: Dict,
+        old_item: Optional[Dict] = None,
+    ) -> None:
+        """Update a single model row in the persistent cache.
+
+        A lightweight alternative to :meth:`save_cache` that performs a targeted
+        DELETE + INSERT for the model row and computes incremental tag / hash-index
+        deltas from *old_item*.  When *old_item* is omitted the previous tags and
+        hash are not cleaned up (callers should only omit it for brand-new entries).
+
+        All operations run inside a single transaction so readers see a consistent
+        view.
+        """
+        if not self.is_enabled():
+            return
+        if not self._schema_initialized:
+            self._initialize_schema()
+        if not self._schema_initialized:
+            return
+
+        file_path: Optional[str] = new_item.get("file_path")
+        if not file_path:
+            return
+
+        try:
+            with self._db_lock:
+                conn = self._connect()
+                try:
+                    conn.execute("PRAGMA foreign_keys = ON")
+                    conn.execute("BEGIN")
+
+                    # --- model row (DELETE + INSERT = upsert) ---
+                    conn.execute(
+                        "DELETE FROM models WHERE model_type = ? AND file_path = ?",
+                        (model_type, file_path),
+                    )
+                    row = self._prepare_model_row(model_type, new_item)
+                    conn.execute(self._insert_model_sql(), row)
+
+                    # --- tags ---
+                    new_tags: set = set(new_item.get("tags") or [])
+                    old_tags: set = set(old_item.get("tags") or []) if old_item else set()
+                    tags_to_delete = old_tags - new_tags
+                    tags_to_insert = new_tags - old_tags
+
+                    if tags_to_delete:
+                        conn.executemany(
+                            "DELETE FROM model_tags WHERE model_type = ? AND file_path = ? AND tag = ?",
+                            [(model_type, file_path, t) for t in tags_to_delete],
+                        )
+                    if tags_to_insert:
+                        conn.executemany(
+                            "INSERT INTO model_tags (model_type, file_path, tag) VALUES (?, ?, ?)",
+                            [(model_type, file_path, t) for t in tags_to_insert],
+                        )
+
+                    # --- hash_index ---
+                    new_sha: Optional[str] = (new_item.get("sha256") or "").lower() or None
+                    old_sha: Optional[str] = (
+                        (old_item.get("sha256") or "").lower() or None
+                    ) if old_item else None
+                    if new_sha != old_sha:
+                        if old_sha:
+                            conn.execute(
+                                "DELETE FROM hash_index WHERE model_type = ? AND sha256 = ? AND file_path = ?",
+                                (model_type, old_sha, file_path),
+                            )
+                        if new_sha:
+                            conn.execute(
+                                "INSERT OR IGNORE INTO hash_index (model_type, sha256, file_path) VALUES (?, ?, ?)",
+                                (model_type, new_sha, file_path),
+                            )
+
+                    conn.execute("COMMIT")
+                except Exception:
+                    conn.execute("ROLLBACK")
+                    raise
+                finally:
+                    conn.close()
+        except Exception as exc:
+            logger.warning(
+                "Failed to update single model in persistent cache (%s): %s",
+                file_path,
+                exc,
+            )
+
     def _load_tags(self, conn: sqlite3.Connection, model_type: str) -> Dict[str, List[str]]:
         tag_rows = conn.execute(
             "SELECT file_path, tag FROM model_tags WHERE model_type = ?",

py/services/recipe_cache.py

@@ -1,7 +1,6 @@
 import asyncio
 from typing import Iterable, List, Dict, Optional
 from dataclasses import dataclass, field
-from operator import itemgetter
 from natsort import natsorted
 
 
@@ -149,5 +148,10 @@ class RecipeCache:
         )
         if not name_only:
             self.sorted_by_date = sorted(
-                self.raw_data, key=itemgetter("created_date", "file_path"), reverse=True
+                self.raw_data,
+                key=lambda x: (
+                    x.get("modified", x.get("created_date", 0)),
+                    x.get("file_path", ""),
+                ),
+                reverse=True,
             )

py/services/recipes/persistence_service.py

@@ -216,11 +216,12 @@ class RecipePersistenceService:
             "preview_nsfw_level",
             "favorite",
             "gen_params",
+            "base_model",
         )
 
         if not any(key in updates for key in allowed_fields):
             raise RecipeValidationError(
-                "At least one field to update must be provided (title or tags or source_path or preview_nsfw_level or favorite or gen_params)"
+                "At least one field to update must be provided (title or tags or source_path or preview_nsfw_level or favorite or gen_params or base_model)"
             )
 
         if "gen_params" in updates and not isinstance(updates["gen_params"], dict):

py/services/settings_manager.py

@@ -65,6 +65,8 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
     "onboarding_completed": False,
     "dismissed_banners": [],
     "enable_metadata_archive_db": False,
+    "enable_civarchive_api": True,
+    "metadata_provider_order": "civitai_archive_sqlite",
     "proxy_enabled": False,
     "proxy_host": "",
     "proxy_port": "",

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-lora-manager"
 description = "Revolutionize your workflow with the ultimate LoRA companion for ComfyUI!"
-version = "1.1.7"
+version = "1.1.8"
 license = {file = "LICENSE"}
 dependencies = [
     "aiohttp",

static/css/components/search-filter.css

@@ -274,6 +274,11 @@
     font-style: italic;
 }
 
+/* Inline extra tags (selected but not in top-20/appended after API results) */
+.filter-tag.extra-tag {
+    border-style: dashed;
+}
+
 /* Ensure solid border and full opacity when active or excluded */
 .filter-tag.special-tag.active,
 .filter-tag.special-tag.exclude {

static/js/api/apiConfig.js

@@ -93,6 +93,7 @@ export function getApiEndpoints(modelType) {
         // Query operations
         scan: `/api/lm/${modelType}/scan`,
         topTags: `/api/lm/${modelType}/top-tags`,
+        searchTags: `/api/lm/${modelType}/search-tags`,
         baseModels: `/api/lm/${modelType}/base-models`,
         roots: `/api/lm/${modelType}/roots`,
         folders: `/api/lm/${modelType}/folders`,

static/js/managers/BulkManager.js

@@ -1665,13 +1665,19 @@ export class BulkManager {
                 cancelled = true;
             });
 
+            const isRecipesPage = state.currentPageType === 'recipes';
+
             for (const filepath of state.selectedModels) {
                 if (cancelled) {
                     showToast('toast.api.operationCancelled', {}, 'info');
                     break;
                 }
                 try {
+                    if (isRecipesPage) {
+                        await updateRecipeMetadata(filepath, { base_model: newBaseModel });
+                    } else {
                         await getModelApiClient().saveModelMetadata(filepath, { base_model: newBaseModel });
+                    }
                     successCount++;
                 } catch (error) {
                     errorCount++;

static/js/managers/FilterManager.js

@@ -1,6 +1,7 @@
 import { getCurrentPageState } from '../state/index.js';
 import { showToast, updatePanelPositions } from '../utils/uiHelpers.js';
 import { getModelApiClient } from '../api/modelApiFactory.js';
+import { getApiEndpoints } from '../api/apiConfig.js';
 import { removeStorageItem, setStorageItem, getStorageItem } from '../utils/storageHelpers.js';
 import { MODEL_TYPE_DISPLAY_NAMES } from '../utils/constants.js';
 import { translate } from '../utils/i18nHelpers.js';
@@ -24,6 +25,12 @@ export class FilterManager {
         this.baseModelOptions = [];
         this.tagsLoaded = false;
 
+        // Tag search state
+        this.modelTagsSearchInput = document.getElementById('modelTagsSearchInput');
+        this.tagSearchDebounceTimer = null;
+        this.tagSearchAbortController = null;
+        this.tagSearchQuery = '';
+
         // Initialize preset manager
         this.presetManager = new FilterPresetManager({
             page: this.currentPage,
@@ -123,6 +130,60 @@ export class FilterManager {
                 this.renderBaseModelTags();
             });
         }
+
+        if (this.modelTagsSearchInput) {
+            this.modelTagsSearchInput.addEventListener('input', () => {
+                clearTimeout(this.tagSearchDebounceTimer);
+                this.tagSearchDebounceTimer = setTimeout(() => {
+                    this.handleTagSearchInput();
+                }, 150);
+            });
+        }
+    }
+
+    handleTagSearchInput() {
+        const query = (this.modelTagsSearchInput?.value || '').trim();
+        const trimmedQuery = query.toLowerCase();
+        if (trimmedQuery === this.tagSearchQuery) return;
+        this.tagSearchQuery = trimmedQuery;
+
+        if (!trimmedQuery) {
+            // Empty query: reload top tags (default/common view)
+            this.loadTopTags();
+            return;
+        }
+        this.searchTags(trimmedQuery);
+    }
+
+    async searchTags(query) {
+        // Abort any in-flight search request
+        if (this.tagSearchAbortController) {
+            this.tagSearchAbortController.abort();
+        }
+        this.tagSearchAbortController = new AbortController();
+        const controller = this.tagSearchAbortController;
+
+        try {
+            const tagsEndpoint = `${getApiEndpoints(this.currentPage).searchTags}?q=${encodeURIComponent(query)}&limit=20`;
+            const response = await fetch(tagsEndpoint, { signal: controller.signal });
+            if (!response.ok) throw new Error('Failed to search tags');
+            const data = await response.json();
+            if (controller.signal.aborted) return; // stale response
+            if (data.success && data.tags) {
+                this.createTagFilterElements(data.tags);
+            } else {
+                throw new Error('Invalid response format');
+            }
+        } catch (error) {
+            if (error.name === 'AbortError') return; // expected, ignore
+            console.error('Error searching tags:', error);
+            const tagsContainer = document.getElementById('modelTagsFilter');
+            if (tagsContainer) {
+                tagsContainer.innerHTML = '<div class="tags-error">Failed to search tags</div>';
+            }
+            const emptyState = document.getElementById('modelTagsEmptyState');
+            if (emptyState) emptyState.hidden = true;
+        }
     }
 
     getNormalizedSearchQuery(input) {
@@ -146,15 +207,24 @@ export class FilterManager {
     }
 
     async loadTopTags() {
+        // Abort any in-flight tag search request
+        if (this.tagSearchAbortController) {
+            this.tagSearchAbortController.abort();
+            this.tagSearchAbortController = null;
+        }
+        this.tagSearchQuery = '';
+
         try {
             // Show loading state
             const tagsContainer = document.getElementById('modelTagsFilter');
+            const emptyState = document.getElementById('modelTagsEmptyState');
             if (!tagsContainer) return;
+            if (emptyState) emptyState.hidden = true;
 
             tagsContainer.innerHTML = '<div class="tags-loading">Loading tags...</div>';
 
             // Determine the API endpoint based on the page type
-            const tagsEndpoint = `/api/lm/${this.currentPage}/top-tags?limit=20`;
+            const tagsEndpoint = `${getApiEndpoints(this.currentPage).topTags}?limit=20`;
 
             const response = await fetch(tagsEndpoint);
             if (!response.ok) throw new Error('Failed to fetch tags');
@@ -179,29 +249,38 @@ export class FilterManager {
 
     createTagFilterElements(tags) {
         const tagsContainer = document.getElementById('modelTagsFilter');
+        const emptyState = document.getElementById('modelTagsEmptyState');
         if (!tagsContainer) return;
 
         tagsContainer.innerHTML = '';
+        if (emptyState) emptyState.hidden = true;
 
         // Collect existing tag names from the API response
         const existingTagNames = new Set(tags.map(t => t.tag));
 
-        // Add any active filter tags that aren't in the top 20
+        // Collect active filter tags that aren't in the response (excluding __no_tags__)
+        const missingSelectedTags = [];
         if (this.filters.tags) {
             Object.keys(this.filters.tags).forEach(tagName => {
-                // Skip special tags like __no_tags__
                 if (tagName.startsWith('__')) return;
-
                 if (!existingTagNames.has(tagName)) {
-                    // Add this tag to the list with count 0 (unknown)
-                    tags.push({ tag: tagName, count: 0 });
+                    missingSelectedTags.push({ tag: tagName, count: 0 });
                     existingTagNames.add(tagName);
                 }
             });
         }
 
+        // Append missing selected tags after the API results so they appear inline
+        for (const t of missingSelectedTags) {
+            tags.push(t);
+        }
+
         if (!tags.length) {
+            if (this.tagSearchQuery) {
+                if (emptyState) emptyState.hidden = false;
+            } else {
                 tagsContainer.innerHTML = `<div class="no-tags">No ${this.currentPage === 'recipes' ? 'recipe ' : ''}tags available</div>`;
+            }
             return;
         }
 
@@ -209,6 +288,10 @@ export class FilterManager {
             const tagEl = document.createElement('div');
             tagEl.className = 'filter-tag tag-filter';
             const tagName = tag.tag;
+
+            if (missingSelectedTags.some(t => t.tag === tagName)) {
+                tagEl.classList.add('extra-tag');
+            }
             tagEl.dataset.tag = tagName;
 
             // Show count only if it's > 0 (known count)
@@ -234,7 +317,8 @@ export class FilterManager {
             tagsContainer.appendChild(tagEl);
         });
 
-        // Add "No tags" as a special filter at the end
+        // Add "No tags" as a special filter at the end (skip during search)
+        if (!this.tagSearchQuery) {
             const noTagsEl = document.createElement('div');
             noTagsEl.className = 'filter-tag tag-filter special-tag';
             const noTagsLabel = translate('header.filter.noTags', {}, 'No tags');
@@ -254,6 +338,7 @@ export class FilterManager {
             });
 
             tagsContainer.appendChild(noTagsEl);
+        }
         this.updateTagSelections();
     }
 
@@ -341,7 +426,7 @@ export class FilterManager {
         if (!baseModelTagsContainer) return;
 
         // Set the API endpoint based on current page
-        const apiEndpoint = `/api/lm/${this.currentPage}/base-models?limit=0`;
+        const apiEndpoint = `${getApiEndpoints(this.currentPage).baseModels}?limit=0`;
 
         // Fetch base models
         fetch(apiEndpoint)
@@ -721,6 +806,16 @@ export class FilterManager {
             tagLogic: 'any'
         });
 
+        // Clear tag search input and reset search state
+        if (this.modelTagsSearchInput) {
+            this.modelTagsSearchInput.value = '';
+        }
+        this.tagSearchQuery = '';
+        if (this.tagSearchAbortController) {
+            this.tagSearchAbortController.abort();
+            this.tagSearchAbortController = null;
+        }
+
         // Update tag logic toggle UI
         this.updateTagLogicToggleUI();
 
@@ -731,6 +826,10 @@ export class FilterManager {
         // Update UI
         this.updateTagSelections();
         this.updateActiveFiltersCount();
+        // Reload tag area to drop any non-top-20 tags from the deactivated preset
+        if (this.tagsLoaded) {
+            await this.loadTopTags();
+        }
         this.presetManager.renderPresets(); // Re-render to remove active state
 
         // Remove from local Storage

static/js/managers/FilterPresetManager.js

@@ -478,11 +478,9 @@ export class FilterPresetManager {
             const pageState = getCurrentPageState();
             pageState.filters = this.filterManager.cloneFilters();
 
-            // If tags haven't been loaded yet, load them first
-            if (!this.filterManager.tagsLoaded) {
+            // Refresh tag display so preset's non-top-20 tags appear inline
             await this.filterManager.loadTopTags();
             this.filterManager.tagsLoaded = true;
-            }
 
             // Check again after async operation
             if (requestId !== this.applyPresetRequestId) return;
@@ -745,8 +743,16 @@ export class FilterPresetManager {
                 presetEl.classList.add('active');
             }
 
-            presetEl.addEventListener('click', (e) => {
-                e.stopPropagation();
+            // Apply preset on click (toggle if already active)
+            // Bind to the whole .filter-preset div so clicking anywhere inside triggers apply
+            presetEl.addEventListener('click', async () => {
+                this.cancelPendingDelete();
+
+                if (this.activePreset === preset.name) {
+                    await this.filterManager.clearFilters();
+                } else {
+                    await this.applyPreset(preset.name);
+                }
             });
 
             const presetName = document.createElement('span');
@@ -759,18 +765,6 @@ export class FilterPresetManager {
             deleteBtn.innerHTML = '<i class="fas fa-times"></i>';
             deleteBtn.title = translate('header.filter.presetDeleteTooltip', {}, 'Delete preset');
 
-            // Apply preset on name click (toggle if already active)
-            presetName.addEventListener('click', async (e) => {
-                e.stopPropagation();
-                this.cancelPendingDelete();
-
-                if (this.activePreset === preset.name) {
-                    await this.filterManager.clearFilters();
-                } else {
-                    await this.applyPreset(preset.name);
-                }
-            });
-
             // Two-step delete on delete button click
             deleteBtn.addEventListener('click', (e) => {
                 e.stopPropagation();

static/js/managers/SettingsManager.js

@@ -2346,6 +2346,16 @@ export class SettingsManager {
                 enableMetadataArchiveCheckbox.checked = state.global.settings.enable_metadata_archive_db || false;
             }
 
+            const enableCivarchiveApiCheckbox = document.getElementById('enableCivarchiveApi');
+            if (enableCivarchiveApiCheckbox) {
+                enableCivarchiveApiCheckbox.checked = state.global.settings.enable_civarchive_api ?? true;
+            }
+
+            const metadataProviderOrderSelect = document.getElementById('metadataProviderOrder');
+            if (metadataProviderOrderSelect) {
+                metadataProviderOrderSelect.value = state.global.settings.metadata_provider_order || 'civitai_archive_sqlite';
+            }
+
             // Load status
             await this.updateMetadataArchiveStatus();
         } catch (error) {

static/js/state/index.js

@@ -13,6 +13,8 @@ const DEFAULT_SETTINGS_BASE = Object.freeze({
     language: 'en',
     show_only_sfw: false,
     enable_metadata_archive_db: false,
+    enable_civarchive_api: true,
+    metadata_provider_order: 'civitai_archive_sqlite',
     proxy_enabled: false,
     proxy_type: 'http',
     proxy_host: '',

static/js/utils/uiHelpers.js

@@ -134,7 +134,10 @@ export async function copyToClipboard(text, successMessage = null) {
 }
 
 export function showToast(key, params = {}, type = 'info', fallback = null) {
-  const message = translate(key, params, fallback);
+  // Plain messages (contain spaces) are not i18n dot-notation keys — use verbatim
+  // to avoid spurious "Translation key not found" warnings from i18next
+  const isPlainMessage = typeof key === 'string' && /\s/.test(key);
+  const message = isPlainMessage ? key : translate(key, params, fallback);
   const toast = document.createElement('div');
   toast.className = `toast toast-${type}`;
   toast.textContent = message;

templates/components/header.html

@@ -251,10 +251,15 @@
         <button class="tag-logic-option" data-value="all" title="{{ t('header.filter.tagLogicAll') }}">{{ t('header.filter.all') }}</button>
       </div>
     </div>
+    <input type="text" id="modelTagsSearchInput" class="filter-search-input"
+      placeholder="{{ t('header.filter.tagSearchPlaceholder') }}" autocomplete="off">
     <div class="filter-tags" id="modelTagsFilter">
       <!-- Top tags will be dynamically inserted here -->
       <div class="tags-loading">{{ t('common.status.loading') }}</div>
     </div>
+    <div id="modelTagsEmptyState" class="filter-empty-state" hidden>
+      {{ t('header.filter.noTagMatches') }}
+    </div>
   </div>
   {% if current_page == 'loras' or current_page == 'checkpoints' %}
   <div class="filter-section">

templates/components/modals/settings_modal.html

@@ -144,6 +144,46 @@
                             </div>
                         </div>
 
+                        <div class="settings-subsection">
+                            <div class="settings-subsection-header">
+                                <h4>{{ t('settings.sections.downloads') }}</h4>
+                            </div>
+                            <div class="setting-item">
+                                <div class="setting-row">
+                                    <div class="setting-info">
+                                        <label for="downloadBackend">{{ t('settings.downloadBackend.label') }}</label>
+                                        <i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.downloadBackend.help') }}"></i>
+                                        <a class="settings-action-link" href="https://github.com/willmiao/ComfyUI-Lora-Manager/wiki/Aria2-Download-Backend-(Experimental)" target="_blank" rel="noopener" aria-label="{{ t('settings.aria2HelpLink') }}" title="{{ t('settings.aria2HelpLink') }}">
+                                            <i class="fas fa-question-circle" aria-hidden="true"></i>
+                                        </a>
+                                    </div>
+                                    <div class="setting-control select-control">
+                                        <select id="downloadBackend" onchange="settingsManager.saveSelectSetting('downloadBackend', 'download_backend')">
+                                            <option value="python">{{ t('settings.downloadBackend.options.python') }}</option>
+                                            <option value="aria2">{{ t('settings.downloadBackend.options.aria2') }}</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="setting-item" id="aria2PathSetting" style="display: none;">
+                                <div class="setting-row">
+                                    <div class="setting-info">
+                                        <label for="aria2cPath">{{ t('settings.aria2cPath.label') }}</label>
+                                        <i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.aria2cPath.help') }}"></i>
+                                    </div>
+                                    <div class="setting-control">
+                                        <div class="text-input-wrapper">
+                                            <input type="text"
+                                                   id="aria2cPath"
+                                                   placeholder="{{ t('settings.aria2cPath.placeholder') }}"
+                                                   onblur="settingsManager.saveInputSetting('aria2cPath', 'aria2c_path')"
+                                                   onkeydown="if(event.key === 'Enter') { this.blur(); }" />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
                         <!-- AI Provider Configuration (BYOK) -->
                         <div class="settings-subsection">
                             <div class="settings-subsection-header">
@@ -250,46 +290,6 @@
                             {{ provider_models_json | safe }}
                         </script>
 
-                        <div class="settings-subsection">
-                            <div class="settings-subsection-header">
-                                <h4>{{ t('settings.sections.downloads') }}</h4>
-                            </div>
-                            <div class="setting-item">
-                                <div class="setting-row">
-                                    <div class="setting-info">
-                                        <label for="downloadBackend">{{ t('settings.downloadBackend.label') }}</label>
-                                        <i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.downloadBackend.help') }}"></i>
-                                        <a class="settings-action-link" href="https://github.com/willmiao/ComfyUI-Lora-Manager/wiki/Aria2-Download-Backend-(Experimental)" target="_blank" rel="noopener" aria-label="{{ t('settings.aria2HelpLink') }}" title="{{ t('settings.aria2HelpLink') }}">
-                                            <i class="fas fa-question-circle" aria-hidden="true"></i>
-                                        </a>
-                                    </div>
-                                    <div class="setting-control select-control">
-                                        <select id="downloadBackend" onchange="settingsManager.saveSelectSetting('downloadBackend', 'download_backend')">
-                                            <option value="python">{{ t('settings.downloadBackend.options.python') }}</option>
-                                            <option value="aria2">{{ t('settings.downloadBackend.options.aria2') }}</option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="setting-item" id="aria2PathSetting" style="display: none;">
-                                <div class="setting-row">
-                                    <div class="setting-info">
-                                        <label for="aria2cPath">{{ t('settings.aria2cPath.label') }}</label>
-                                        <i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.aria2cPath.help') }}"></i>
-                                    </div>
-                                    <div class="setting-control">
-                                        <div class="text-input-wrapper">
-                                            <input type="text"
-                                                   id="aria2cPath"
-                                                   placeholder="{{ t('settings.aria2cPath.placeholder') }}"
-                                                   onblur="settingsManager.saveInputSetting('aria2cPath', 'aria2c_path')"
-                                                   onkeydown="if(event.key === 'Enter') { this.blur(); }" />
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
                         <!-- Backup -->
                         <div class="settings-subsection">
                             <div class="settings-subsection-header">
@@ -1401,7 +1401,26 @@
                                 <div class="settings-input-error-message" id="metadataRefreshSkipPathsError"></div>
                             </div>
                             
-                            <!-- Metadata Archive -->
+                            <!-- CivArchive API provider toggle -->
+                            <div class="setting-item">
+                                <div class="setting-row">
+                                    <div class="setting-info">
+                                        <label for="enableCivarchiveApi">
+                                            {{ t('settings.metadataArchive.enableCivarchiveApi') }}
+                                            <i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.metadataArchive.enableCivarchiveApiHelp') }}"></i>
+                                        </label>
+                                    </div>
+                                    <div class="setting-control">
+                                        <label class="toggle-switch">
+                                            <input type="checkbox" id="enableCivarchiveApi"
+                                                   onchange="settingsManager.saveToggleSetting('enableCivarchiveApi', 'enable_civarchive_api')">
+                                            <span class="toggle-slider"></span>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <!-- Metadata Archive DB -->
                             <div class="setting-item">
                                 <div class="setting-row">
                                     <div class="setting-info">
@@ -1444,6 +1463,24 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <!-- Metadata provider fallback order -->
+                            <div class="setting-item">
+                                <div class="setting-row">
+                                    <div class="setting-info">
+                                        <label for="metadataProviderOrder">
+                                            {{ t('settings.metadataArchive.providerOrder') }}
+                                            <i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.metadataArchive.providerOrderHelp') }}"></i>
+                                        </label>
+                                    </div>
+                                    <div class="setting-control select-control">
+                                        <select id="metadataProviderOrder" onchange="settingsManager.saveSelectSetting('metadataProviderOrder', 'metadata_provider_order')">
+                                            <option value="civitai_archive_sqlite">{{ t('settings.metadataArchive.providerOrderCivitaiArchiveSqlite') }}</option>
+                                            <option value="civitai_sqlite_archive">{{ t('settings.metadataArchive.providerOrderCivitaiSqliteArchive') }}</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>

tests/frontend/components/pageControls.filtering.test.js

@@ -113,6 +113,8 @@ function renderControlsDom(pageKey) {
       <div id="baseModelEmptyState" hidden></div>
       <div id="filterPresets" class="filter-presets"></div>
       <div id="modelTagsFilter" class="filter-tags"></div>
+      <input id="modelTagsSearchInput" />
+      <div id="modelTagsEmptyState" hidden></div>
       <button class="clear-filter"></button>
     </div>
     <div class="controls">
@@ -961,4 +963,198 @@ describe('PageControls favorites, sorting, and duplicates scenarios', () => {
     expect(stateModule.state.bulkMode).toBe(true);
     expect(pageState.duplicatesMode).toBe(true);
   });
+
+  describe('tag search', () => {
+    it('fetches /search-tags when typing in the tag search input (debounced)', async () => {
+      vi.useFakeTimers();
+      const searchTagsUrls = [];
+      global.fetch = vi.fn((url) => {
+        if (url.includes('/search-tags')) {
+          searchTagsUrls.push(url);
+          return Promise.resolve({
+            ok: true,
+            json: async () => ({ success: true, tags: [{ tag: 'anime', count: 3 }] }),
+          });
+        }
+        if (url.includes('/top-tags')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
+        }
+        if (url.includes('/base-models')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
+        }
+        if (url.includes('/model-types')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
+        }
+        return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
+      });
+
+      renderControlsDom('loras');
+      const stateModule = await import('../../../static/js/state/index.js');
+      stateModule.initPageState('loras');
+      const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
+      const manager = new FilterManager({ page: 'loras' });
+
+      // Open the panel so tags load
+      manager.toggleFilterPanel();
+      await vi.runAllTimersAsync();
+
+      const input = document.getElementById('modelTagsSearchInput');
+      input.value = 'ani';
+      input.dispatchEvent(new Event('input', { bubbles: true }));
+
+      // Before debounce fires, no search-tags call yet
+      expect(searchTagsUrls.length).toBe(0);
+
+      // Advance past the 150ms debounce
+      vi.advanceTimersByTime(160);
+      await vi.runAllTimersAsync();
+
+      expect(searchTagsUrls.length).toBe(1);
+      expect(searchTagsUrls[0]).toContain('/search-tags');
+      expect(searchTagsUrls[0]).toContain('q=ani');
+
+      vi.useRealTimers();
+    });
+
+    it('renders selected-but-missing tags in a dedicated group at the top', async () => {
+      vi.useFakeTimers();
+      global.fetch = vi.fn((url) => {
+        if (url.includes('/search-tags')) {
+          return Promise.resolve({
+            ok: true,
+            json: async () => ({ success: true, tags: [{ tag: 'anime', count: 3 }] }),
+          });
+        }
+        if (url.includes('/top-tags')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
+        }
+        if (url.includes('/base-models')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
+        }
+        if (url.includes('/model-types')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
+        }
+        return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
+      });
+
+      renderControlsDom('loras');
+      const stateModule = await import('../../../static/js/state/index.js');
+      stateModule.initPageState('loras');
+      const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
+      const manager = new FilterManager({ page: 'loras' });
+
+      // Pre-seed an active tag filter that won't appear in search results
+      manager.filters.tags = { 'my-custom-tag': 'include' };
+
+      // Open panel and let top-tags load (empty)
+      manager.toggleFilterPanel();
+      await vi.runAllTimersAsync();
+
+      // Type a search query
+      const input = document.getElementById('modelTagsSearchInput');
+      input.value = 'ani';
+      input.dispatchEvent(new Event('input', { bubbles: true }));
+      vi.advanceTimersByTime(160);
+      await vi.runAllTimersAsync();
+
+      const container = document.getElementById('modelTagsFilter');
+      const extraTag = container.querySelector('.filter-tag.extra-tag');
+      expect(extraTag).not.toBeNull();
+      expect(extraTag.dataset.tag).toBe('my-custom-tag');
+
+      // The search result tag should also be present
+      const resultTag = container.querySelector('.filter-tag.tag-filter[data-tag="anime"]');
+      expect(resultTag).not.toBeNull();
+
+      vi.useRealTimers();
+    });
+
+    it('shows empty state when search returns no matches and no selected tags', async () => {
+      vi.useFakeTimers();
+      global.fetch = vi.fn((url) => {
+        if (url.includes('/search-tags')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
+        }
+        if (url.includes('/top-tags')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
+        }
+        if (url.includes('/base-models')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
+        }
+        if (url.includes('/model-types')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
+        }
+        return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
+      });
+
+      renderControlsDom('loras');
+      const stateModule = await import('../../../static/js/state/index.js');
+      stateModule.initPageState('loras');
+      const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
+      const manager = new FilterManager({ page: 'loras' });
+
+      manager.toggleFilterPanel();
+      await vi.runAllTimersAsync();
+
+      const input = document.getElementById('modelTagsSearchInput');
+      input.value = 'zzz';
+      input.dispatchEvent(new Event('input', { bubbles: true }));
+      vi.advanceTimersByTime(160);
+      await vi.runAllTimersAsync();
+
+      const emptyState = document.getElementById('modelTagsEmptyState');
+      expect(emptyState.hidden).toBe(false);
+
+      vi.useRealTimers();
+    });
+
+    it('reloads top tags when search input is cleared', async () => {
+      vi.useFakeTimers();
+      let topTagsCallCount = 0;
+      global.fetch = vi.fn((url) => {
+        if (url.includes('/search-tags')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [{ tag: 'anime', count: 3 }] }) });
+        }
+        if (url.includes('/top-tags')) {
+          topTagsCallCount++;
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
+        }
+        if (url.includes('/base-models')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
+        }
+        if (url.includes('/model-types')) {
+          return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
+        }
+        return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
+      });
+
+      renderControlsDom('loras');
+      const stateModule = await import('../../../static/js/state/index.js');
+      stateModule.initPageState('loras');
+      const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
+      const manager = new FilterManager({ page: 'loras' });
+
+      manager.toggleFilterPanel();
+      await vi.runAllTimersAsync();
+      const callsAfterOpen = topTagsCallCount;
+      expect(callsAfterOpen).toBeGreaterThanOrEqual(1);
+
+      // Type, then clear
+      const input = document.getElementById('modelTagsSearchInput');
+      input.value = 'ani';
+      input.dispatchEvent(new Event('input', { bubbles: true }));
+      vi.advanceTimersByTime(160);
+      await vi.runAllTimersAsync();
+
+      input.value = '';
+      input.dispatchEvent(new Event('input', { bubbles: true }));
+      vi.advanceTimersByTime(160);
+      await vi.runAllTimersAsync();
+
+      // An additional top-tags call should have happened after clearing
+      expect(topTagsCallCount).toBeGreaterThan(callsAfterOpen);
+
+      vi.useRealTimers();
+    });
+  });
 });

tests/routes/test_model_query_handler.py

@@ -36,3 +36,53 @@ async def test_model_query_handler_rejects_negative_limit_for_base_models():
     await handler.get_base_models(SimpleNamespace(query={"limit": "-1"}))
 
     assert service.received_limit == 20
+
+
+class DummySearchTagsService:
+    """Minimal service stub recording search_tags arguments."""
+
+    def __init__(self, result=None):
+        self.received_query = None
+        self.received_limit = None
+        self._result = result or []
+
+    async def search_tags(self, query, limit):
+        self.received_query = query
+        self.received_limit = limit
+        return self._result
+
+
+@pytest.mark.asyncio
+async def test_model_query_handler_search_tags_passes_query_and_limit():
+    service = DummySearchTagsService(result=[{"tag": "anime", "count": 3}])
+    handler = ModelQueryHandler(service=service, logger=logging.getLogger(__name__))
+
+    response = await handler.search_tags(
+        SimpleNamespace(query={"q": "ani", "limit": "50"})
+    )
+    payload = json.loads(response.text)
+
+    assert payload["success"] is True
+    assert payload["tags"] == [{"tag": "anime", "count": 3}]
+    assert service.received_query == "ani"
+    assert service.received_limit == 50
+
+
+@pytest.mark.asyncio
+async def test_model_query_handler_search_tags_defaults_limit_to_20():
+    service = DummySearchTagsService()
+    handler = ModelQueryHandler(service=service, logger=logging.getLogger(__name__))
+
+    await handler.search_tags(SimpleNamespace(query={}))
+
+    assert service.received_limit == 20
+
+
+@pytest.mark.asyncio
+async def test_model_query_handler_search_tags_clamps_negative_limit():
+    service = DummySearchTagsService()
+    handler = ModelQueryHandler(service=service, logger=logging.getLogger(__name__))
+
+    await handler.search_tags(SimpleNamespace(query={"limit": "-5"}))
+
+    assert service.received_limit == 20

tests/services/test_metadata_service.py

@@ -60,3 +60,114 @@ async def test_get_metadata_provider_returns_fallback_as_is(monkeypatch):
     provider = await metadata_service.get_metadata_provider()
 
     assert provider is fallback
+
+
+# ---------------------------------------------------------------------------
+# initialize_metadata_providers — provider gating + fallback ordering
+# ---------------------------------------------------------------------------
+
+
+def _stub_settings(**overrides):
+    """Minimal settings stub returning configured values."""
+    base = {
+        "enable_metadata_archive_db": False,
+        "enable_civarchive_api": True,
+        "metadata_provider_order": "civitai_archive_sqlite",
+    }
+    base.update(overrides)
+    return SimpleNamespace(get=lambda key, default=None: base.get(key, default))
+
+
+async def _run_initialize(monkeypatch, settings):
+    # Fresh provider manager for each test
+    monkeypatch.setattr(
+        metadata_service.ModelMetadataProviderManager,
+        "get_instance",
+        AsyncMock(return_value=metadata_service.ModelMetadataProviderManager()),
+    )
+    monkeypatch.setattr(
+        metadata_service, "get_settings_manager", lambda: settings
+    )
+    monkeypatch.setattr(
+        metadata_service.ServiceRegistry,
+        "get_civitai_client",
+        AsyncMock(return_value=object()),
+    )
+    monkeypatch.setattr(
+        metadata_service.ServiceRegistry,
+        "get_civarchive_client",
+        AsyncMock(return_value=object()),
+    )
+
+    # Make MetadataArchiveManager report a usable db path when enabled
+    fake_archive = SimpleNamespace(get_database_path=lambda: "/tmp/fake.db")
+    monkeypatch.setattr(
+        metadata_service, "MetadataArchiveManager", lambda _base: fake_archive
+    )
+    # Pretend the db file exists
+    monkeypatch.setattr(metadata_service.os.path, "exists", lambda _p: True)
+
+    manager = await metadata_service.initialize_metadata_providers()
+    return manager
+
+
+def _fallback_provider_order(manager):
+    """Return the ordered list of provider labels inside the fallback provider."""
+    fallback = manager.providers.get("fallback")
+    assert isinstance(fallback, FallbackMetadataProvider), "expected a fallback provider"
+    return list(fallback._provider_labels)
+
+
+@pytest.mark.asyncio
+async def test_initialize_providers_default_order(monkeypatch):
+    settings = _stub_settings(enable_metadata_archive_db=True)
+    manager = await _run_initialize(monkeypatch, settings)
+    assert _fallback_provider_order(manager) == ["civitai_api", "civarchive_api", "sqlite"]
+
+
+@pytest.mark.asyncio
+async def test_initialize_providers_prefer_sqlite_order(monkeypatch):
+    settings = _stub_settings(
+        enable_metadata_archive_db=True,
+        metadata_provider_order="civitai_sqlite_archive",
+    )
+    manager = await _run_initialize(monkeypatch, settings)
+    assert _fallback_provider_order(manager) == ["civitai_api", "sqlite", "civarchive_api"]
+
+
+@pytest.mark.asyncio
+async def test_initialize_providers_disables_civarchive(monkeypatch):
+    settings = _stub_settings(
+        enable_metadata_archive_db=True,
+        enable_civarchive_api=False,
+    )
+    manager = await _run_initialize(monkeypatch, settings)
+    # civarchive_api must not be registered at all
+    assert "civarchive_api" not in manager.providers
+    assert _fallback_provider_order(manager) == ["civitai_api", "sqlite"]
+
+
+@pytest.mark.asyncio
+async def test_initialize_providers_skips_unavailable_sqlite_in_preset(monkeypatch):
+    # Preset wants sqlite before civarchive, but archive db is disabled ->
+    # sqlite is unavailable and must be skipped, civarchive stays.
+    settings = _stub_settings(
+        enable_metadata_archive_db=False,
+        metadata_provider_order="civitai_sqlite_archive",
+    )
+    manager = await _run_initialize(monkeypatch, settings)
+    assert _fallback_provider_order(manager) == ["civitai_api", "civarchive_api"]
+
+
+@pytest.mark.asyncio
+async def test_initialize_providers_single_provider_when_only_civitai(monkeypatch):
+    # Both archive db and civarchive disabled -> only civitai_api remains,
+    # which takes the single-provider path (registered as default, no fallback).
+    settings = _stub_settings(
+        enable_metadata_archive_db=False,
+        enable_civarchive_api=False,
+    )
+    manager = await _run_initialize(monkeypatch, settings)
+    assert "fallback" not in manager.providers
+    assert manager.default_provider == "civitai_api"
+

tests/services/test_model_scanner.py

@@ -667,3 +667,310 @@ async def test_log_duplicate_filename_summary_silent_when_no_duplicates(tmp_path
     # No warning should be logged when there are no duplicates
     for record in caplog.records:
         assert "Duplicate filename conflict detected" not in record.message
+
+
+# ── _cache_entries_differ ────────────────────────────────────────────
+
+
+@pytest.mark.parametrize(
+    "a_tags, b_tags, expect_differ",
+    [
+        (["alpha", "beta"], ["beta", "alpha"], False),  # order-insensitive
+        (["alpha"], ["alpha", "beta"], True),            # count differs
+        ([], ["alpha"], True),
+        (None, [], False),                               # None ≈ []
+        (["alpha"], None, True),
+    ],
+)
+def test_cache_entries_differ_tags(a_tags, b_tags, expect_differ):
+    base = {"file_path": "/m/a.safetensors", "model_name": "A", "size": 1}
+    entry_a = {**base, "tags": a_tags}
+    entry_b = {**base, "tags": b_tags}
+    assert ModelScanner._cache_entries_differ(entry_a, entry_b) == expect_differ
+
+
+def test_cache_entries_differ_identical():
+    entry = {
+        "file_path": "/m/a.safetensors", "model_name": "A", "size": 1,
+        "tags": ["x"], "civitai": {"id": 1}, "notes": "hi",
+    }
+    assert ModelScanner._cache_entries_differ(entry, dict(entry)) is False
+
+
+def test_cache_entries_differ_field_changed():
+    a = {"file_path": "/m/a.safetensors", "model_name": "A", "size": 1}
+    b = {**a, "model_name": "B"}
+    assert ModelScanner._cache_entries_differ(a, b) is True
+
+
+def test_cache_entries_differ_extra_key():
+    a = {"file_path": "/m/a.safetensors", "model_name": "A"}
+    b = {**a, "extra_field": "value"}
+    assert ModelScanner._cache_entries_differ(a, b) is True
+
+
+# ── sync_cache_from_metadata ─────────────────────────────────────────
+
+
+def _make_cache_entry(**overrides) -> dict:
+    entry = {
+        "file_path": "/m/a.safetensors",
+        "model_name": "TestModel",
+        "file_name": "a",
+        "folder": "",
+        "size": 100,
+        "modified": 10.0,
+        "sha256": "abc123",
+        "base_model": "SD1.5",
+        "preview_url": "",
+        "preview_nsfw_level": 0,
+        "from_civitai": True,
+        "favorite": False,
+        "notes": "old note",
+        "usage_tips": "{}",
+        "metadata_source": None,
+        "exclude": False,
+        "db_checked": False,
+        "last_checked_at": 0.0,
+        "tags": ["alpha"],
+        "civitai": {"id": 111, "modelId": 222, "name": "v1"},
+        "civitai_deleted": False,
+        "skip_metadata_refresh": False,
+        "hf_url": "",
+        "license_flags": 113,
+        "hash_status": "completed",
+    }
+    entry.update(overrides)
+    return entry
+
+
+@pytest.mark.asyncio
+async def test_sync_cache_no_change(tmp_path: Path):
+    """When metadata matches the cache entry, return False and mutate nothing."""
+    scanner = DummyScanner(tmp_path)
+    entry = _make_cache_entry()
+    scanner._cache = ModelCache(
+        raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
+    )
+    await scanner._cache.resort()
+    scanner._tags_count = {"alpha": 1}
+    scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
+
+    # metadata_dict that would produce the identical cache entry
+    metadata_dict = {
+        "file_path": "/m/a.safetensors",
+        "model_name": "TestModel",
+        "file_name": "a",
+        "folder": "",
+        "size": 100,
+        "modified": 10.0,
+        "sha256": "abc123",
+        "base_model": "SD1.5",
+        "preview_url": "",
+        "preview_nsfw_level": 0,
+        "from_civitai": True,
+        "favorite": False,
+        "notes": "old note",
+        "usage_tips": "{}",
+        "tags": ["alpha"],
+        "civitai": {"id": 111, "modelId": 222, "name": "v1"},
+        "hf_url": "",
+    }
+
+    changed = await scanner.sync_cache_from_metadata(
+        "/m/a.safetensors", metadata_dict
+    )
+    assert changed is False
+    # Verify cache was NOT mutated
+    cached = await scanner.get_cached_data()
+    assert cached.raw_data[0]["notes"] == "old note"
+
+
+@pytest.mark.asyncio
+async def test_sync_cache_in_place_update(tmp_path: Path):
+    """When metadata differs, update the cache entry in-place."""
+    scanner = DummyScanner(tmp_path)
+    entry = _make_cache_entry(notes="old note", tags=["alpha"], model_name="OldName")
+    scanner._cache = ModelCache(
+        raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
+    )
+    await scanner._cache.resort()
+    scanner._tags_count = {"alpha": 1}
+    scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
+
+    # Capture the exact dict object in raw_data before sync
+    original_entry_ref = scanner._cache.raw_data[0]
+
+    metadata_dict = {
+        "file_path": "/m/a.safetensors",
+        "model_name": "NewName",
+        "file_name": "a",
+        "folder": "",
+        "size": 100,
+        "modified": 10.0,
+        "sha256": "abc123",
+        "base_model": "SD1.5",
+        "preview_url": "",
+        "preview_nsfw_level": 0,
+        "from_civitai": True,
+        "favorite": False,
+        "notes": "new note",
+        "usage_tips": "{}",
+        "tags": ["beta", "gamma"],
+        "civitai": {"id": 111, "modelId": 222, "name": "v1"},
+        "hf_url": "",
+    }
+
+    changed = await scanner.sync_cache_from_metadata(
+        "/m/a.safetensors", metadata_dict
+    )
+    assert changed is True
+
+    cached = await scanner.get_cached_data()
+    updated = cached.raw_data[0]
+    # In-place: the same dict object persisted in raw_data
+    assert updated is original_entry_ref
+    assert updated["notes"] == "new note"
+    assert updated["model_name"] == "NewName"
+    assert sorted(updated["tags"]) == ["beta", "gamma"]
+    # Tag counts updated incrementally
+    assert scanner._tags_count.get("alpha", 0) == 0
+    assert scanner._tags_count.get("beta", 0) == 1
+    assert scanner._tags_count.get("gamma", 0) == 1
+
+
+@pytest.mark.asyncio
+async def test_sync_cache_not_in_cache_delegates(tmp_path: Path):
+    """When the file_path is not in the cache at all, fall back to full update."""
+    scanner = DummyScanner(tmp_path)
+    scanner._cache = ModelCache(raw_data=[], folders=[], name_display_mode="model_name")
+    await scanner._cache.resort()
+
+    metadata_dict = {
+        "file_path": "/m/b.safetensors",
+        "model_name": "BrandNew",
+        "file_name": "b",
+        "folder": "",
+        "size": 200,
+        "modified": 20.0,
+        "sha256": "def456",
+        "base_model": "SDXL",
+        "preview_url": "",
+        "preview_nsfw_level": 0,
+        "from_civitai": True,
+        "favorite": False,
+        "notes": "",
+        "usage_tips": "{}",
+        "tags": [],
+        "civitai": {},
+        "hf_url": "",
+    }
+
+    changed = await scanner.sync_cache_from_metadata(
+        "/m/b.safetensors", metadata_dict
+    )
+    assert changed is True
+    cached = await scanner.get_cached_data()
+    assert len(cached.raw_data) == 1
+    assert cached.raw_data[0]["model_name"] == "BrandNew"
+
+
+@pytest.mark.asyncio
+async def test_sync_cache_conditional_resort_skipped(tmp_path: Path, monkeypatch):
+    """When only non-sort-key fields change, resort() is NOT called."""
+    scanner = DummyScanner(tmp_path)
+    entry = _make_cache_entry(notes="old note", model_name="SameName")
+    scanner._cache = ModelCache(
+        raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
+    )
+    await scanner._cache.resort()
+    scanner._cache._last_sort = ("name", "asc")  # name sort is active
+    scanner._tags_count = {"alpha": 1}
+    scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
+
+    # Track resort calls
+    resort_called = False
+    original_resort = scanner._cache.resort
+
+    async def tracking_resort():
+        nonlocal resort_called
+        resort_called = True
+        await original_resort()
+
+    monkeypatch.setattr(scanner._cache, "resort", tracking_resort)
+
+    metadata_dict = {
+        "file_path": "/m/a.safetensors",
+        "model_name": "SameName",  # unchanged — no resort needed
+        "file_name": "a",
+        "folder": "",
+        "size": 100,
+        "modified": 10.0,
+        "sha256": "abc123",
+        "base_model": "SD1.5",
+        "preview_url": "",
+        "preview_nsfw_level": 0,
+        "from_civitai": True,
+        "favorite": False,
+        "notes": "updated note",  # changed, but not sort-relevant
+        "usage_tips": "{}",
+        "tags": ["alpha"],
+        "civitai": {"id": 111, "modelId": 222, "name": "v1"},
+        "hf_url": "",
+    }
+
+    changed = await scanner.sync_cache_from_metadata(
+        "/m/a.safetensors", metadata_dict
+    )
+    assert changed is True
+    assert resort_called is False
+
+
+@pytest.mark.asyncio
+async def test_sync_cache_conditional_resort_triggered(tmp_path: Path, monkeypatch):
+    """When the sort-key field changes, resort() IS called."""
+    scanner = DummyScanner(tmp_path)
+    entry = _make_cache_entry(model_name="OldName")
+    scanner._cache = ModelCache(
+        raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
+    )
+    await scanner._cache.resort()
+    scanner._cache._last_sort = ("name", "asc")
+    scanner._tags_count = {"alpha": 1}
+    scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
+
+    resort_calls = 0
+    original_resort = scanner._cache.resort
+
+    async def tracking_resort():
+        nonlocal resort_calls
+        resort_calls += 1
+        await original_resort()
+
+    monkeypatch.setattr(scanner._cache, "resort", tracking_resort)
+
+    metadata_dict = {
+        "file_path": "/m/a.safetensors",
+        "model_name": "NewName",  # changed — should trigger resort
+        "file_name": "a",
+        "folder": "",
+        "size": 100,
+        "modified": 10.0,
+        "sha256": "abc123",
+        "base_model": "SD1.5",
+        "preview_url": "",
+        "preview_nsfw_level": 0,
+        "from_civitai": True,
+        "favorite": False,
+        "notes": "old note",
+        "usage_tips": "{}",
+        "tags": ["alpha"],
+        "civitai": {"id": 111, "modelId": 222, "name": "v1"},
+        "hf_url": "",
+    }
+
+    changed = await scanner.sync_cache_from_metadata(
+        "/m/a.safetensors", metadata_dict
+    )
+    assert changed is True
+    assert resort_calls == 1

tests/services/test_persistent_model_cache.py

@@ -225,3 +225,119 @@ def test_incremental_updates_only_touch_changed_rows(tmp_path: Path, monkeypatch
     assert second['metadata_source'] == 'archive_db'
     assert second['civitai_deleted'] is True
     assert second['civitai']['creator']['username'] == 'builder_v2'
+
+
+# ── update_single_model ───────────────────────────────────────────────
+
+
+def test_update_single_model_insert(tmp_path: Path, monkeypatch):
+    """Insert a brand-new model row via update_single_model."""
+    monkeypatch.setenv('LORA_MANAGER_DISABLE_PERSISTENT_CACHE', '0')
+    db_path = tmp_path / 'cache.sqlite'
+    store = PersistentModelCache(db_path=str(db_path))
+
+    file_path = (tmp_path / 'x.safetensors').as_posix()
+    new_item = {
+        'file_path': file_path,
+        'file_name': 'x',
+        'model_name': 'Model X',
+        'folder': '',
+        'size': 42,
+        'modified': 1.0,
+        'sha256': 'sha-x',
+        'base_model': 'SDXL',
+        'preview_url': '',
+        'preview_nsfw_level': 0,
+        'from_civitai': True,
+        'favorite': True,
+        'notes': 'test note',
+        'usage_tips': '{}',
+        'metadata_source': None,
+        'exclude': False,
+        'db_checked': False,
+        'last_checked_at': 0.0,
+        'tags': ['test', 'new'],
+        'civitai': None,
+        'civitai_deleted': False,
+        'skip_metadata_refresh': False,
+        'license_flags': DEFAULT_LICENSE_FLAGS,
+        'hash_status': 'completed',
+        'hf_url': '',
+    }
+
+    store.update_single_model('dummy', new_item)
+
+    persisted = store.load_cache('dummy')
+    assert persisted is not None
+    items = {item['file_path']: item for item in persisted.raw_data}
+    assert file_path in items
+    assert items[file_path]['model_name'] == 'Model X'
+    assert items[file_path]['favorite'] is True
+    assert sorted(items[file_path]['tags']) == ['new', 'test']
+
+
+def test_update_single_model_update_tags(tmp_path: Path, monkeypatch):
+    """Tags are updated incrementally: old tags removed, new tags added."""
+    monkeypatch.setenv('LORA_MANAGER_DISABLE_PERSISTENT_CACHE', '0')
+    db_path = tmp_path / 'cache.sqlite'
+    store = PersistentModelCache(db_path=str(db_path))
+
+    file_path = (tmp_path / 'y.safetensors').as_posix()
+    base = {
+        'file_path': file_path, 'file_name': 'y', 'model_name': 'Y',
+        'folder': '', 'size': 1, 'modified': 1.0, 'sha256': 'sha-y',
+        'base_model': '', 'preview_url': '', 'preview_nsfw_level': 0,
+        'from_civitai': True, 'favorite': False, 'notes': '', 'usage_tips': '{}',
+        'metadata_source': None, 'exclude': False, 'db_checked': False,
+        'last_checked_at': 0.0, 'civitai': None, 'civitai_deleted': False,
+        'skip_metadata_refresh': False, 'license_flags': DEFAULT_LICENSE_FLAGS,
+        'hash_status': 'completed', 'hf_url': '',
+    }
+
+    # First insert with tags [alpha, beta]
+    store.update_single_model('dummy', {**base, 'tags': ['alpha', 'beta']})
+
+    # Now update: replace with [beta, gamma]
+    old_item = {'file_path': file_path, 'tags': ['alpha', 'beta'], 'sha256': 'sha-y'}
+    new_item = {**base, 'tags': ['beta', 'gamma']}
+    store.update_single_model('dummy', new_item, old_item=old_item)
+
+    persisted = store.load_cache('dummy')
+    assert persisted is not None
+    items = {item['file_path']: item for item in persisted.raw_data}
+    assert sorted(items[file_path]['tags']) == ['beta', 'gamma']
+
+
+def test_update_single_model_update_hash(tmp_path: Path, monkeypatch):
+    """When sha256 changes, the hash_index is updated incrementally."""
+    monkeypatch.setenv('LORA_MANAGER_DISABLE_PERSISTENT_CACHE', '0')
+    db_path = tmp_path / 'cache.sqlite'
+    store = PersistentModelCache(db_path=str(db_path))
+
+    file_path = (tmp_path / 'z.safetensors').as_posix()
+    base = {
+        'file_path': file_path, 'file_name': 'z', 'model_name': 'Z',
+        'folder': '', 'size': 1, 'modified': 1.0, 'base_model': '',
+        'preview_url': '', 'preview_nsfw_level': 0, 'from_civitai': True,
+        'favorite': False, 'notes': '', 'usage_tips': '{}',
+        'metadata_source': None, 'exclude': False, 'db_checked': False,
+        'last_checked_at': 0.0, 'tags': [], 'civitai': None,
+        'civitai_deleted': False, 'skip_metadata_refresh': False,
+        'license_flags': DEFAULT_LICENSE_FLAGS, 'hash_status': 'completed', 'hf_url': '',
+    }
+
+    store.update_single_model('dummy', {**base, 'sha256': 'old-hash'})
+
+    old_item = {'file_path': file_path, 'tags': [], 'sha256': 'old-hash'}
+    new_item = {**base, 'sha256': 'new-hash'}
+    store.update_single_model('dummy', new_item, old_item=old_item)
+
+    persisted = store.load_cache('dummy')
+    assert persisted is not None
+    # old hash should be gone from hash_index
+    old_hash_pairs = [p for p in persisted.hash_rows if p[0] == 'old-hash']
+    assert len(old_hash_pairs) == 0
+    # new hash should be present
+    new_hash_pairs = [p for p in persisted.hash_rows if p[0] == 'new-hash']
+    assert len(new_hash_pairs) == 1
+    assert new_hash_pairs[0][1] == file_path

web/comfyui/loras_widget_events.js

@@ -438,7 +438,9 @@ export function initReorderDrag(dragHandle, loraName, widget, renderFunction) {
       if (firstEntry) {
         const rect = firstEntry.getBoundingClientRect();
         const containerRect = container.getBoundingClientRect();
-        dropIndicator.style.top = `${(rect.top - containerRect.top - 2) / scale}px`;
+        // Convert GBCR visual offset to container-local space (rect/containerRect are post-scale,
+        // scrollTop is pre-scale), so only the visual-diff portion is divided by scale
+        dropIndicator.style.top = `${(rect.top - containerRect.top) / scale + container.scrollTop - 2}px`;
         dropIndicator.style.opacity = '1';
       }
     } else if (targetIndex < entries.length) {
@@ -447,7 +449,7 @@ export function initReorderDrag(dragHandle, loraName, widget, renderFunction) {
       if (targetEntry) {
         const rect = targetEntry.getBoundingClientRect();
         const containerRect = container.getBoundingClientRect();
-        dropIndicator.style.top = `${(rect.top - containerRect.top - 2) / scale}px`;
+        dropIndicator.style.top = `${(rect.top - containerRect.top) / scale + container.scrollTop - 2}px`;
         dropIndicator.style.opacity = '1';
       }
     } else {
@@ -456,7 +458,7 @@ export function initReorderDrag(dragHandle, loraName, widget, renderFunction) {
       if (lastEntry) {
         const rect = lastEntry.getBoundingClientRect();
         const containerRect = container.getBoundingClientRect();
-        dropIndicator.style.top = `${(rect.bottom - containerRect.top + 2) / scale}px`;
+        dropIndicator.style.top = `${(rect.bottom - containerRect.top) / scale + container.scrollTop + 2}px`;
         dropIndicator.style.opacity = '1';
       }
     }