diff --git a/app/src/main/java/exh/eh/tags/Artist.kt b/app/src/main/java/exh/eh/tags/Artist.kt
index a7b7aead2..69e48d03f 100644
--- a/app/src/main/java/exh/eh/tags/Artist.kt
+++ b/app/src/main/java/exh/eh/tags/Artist.kt
@@ -13,6 +13,7 @@ object Artist : TagList {
         "artist:1 equals 2",
         "artist:1 tsu o",
         "artist:1-gou",
+        "artist:1000c",
         "artist:100yen locker",
         "artist:1041",
         "artist:107 ko",
@@ -294,6 +295,7 @@ object Artist : TagList {
         "artist:akazai",
         "artist:akazaki yasuma",
         "artist:akaze kidai",
+        "artist:akazuan",
         "artist:akb",
         "artist:akenagi yoshiha",
         "artist:akenotsuki renya",
@@ -571,6 +573,7 @@ object Artist : TagList {
         "artist:animewave",
         "artist:animo pron",
         "artist:anixaila",
+        "artist:aniya yuiji",
         "artist:ankk",
         "artist:anmitsu",
         "artist:anmo night",
@@ -700,6 +703,7 @@ object Artist : TagList {
         "artist:arcana mi",
         "artist:arch stanton",
         "artist:archipelago",
+        "artist:arcquos",
         "artist:arctic ruins",
         "artist:arctic-sekai",
         "artist:arcturusx1",
@@ -730,6 +734,7 @@ object Artist : TagList {
         "artist:arinotowatari",
         "artist:arisaka atsumi",
         "artist:arisaka k",
+        "artist:arisane",
         "artist:arisawa masaharu",
         "artist:arishi jun",
         "artist:arisuga akira",
@@ -945,6 +950,7 @@ object Artist : TagList {
         "artist:b. gorou",
         "artist:b.b",
         "artist:b0nf1r3",
+        "artist:baa",
         "artist:baba arumi",
         "artist:babs",
         "artist:babu",
@@ -1042,9 +1048,9 @@ object Artist : TagList {
         "artist:bendzz",
         "artist:benhxgx",
         "artist:beniamino delvecchio",
-        "artist:benico",
         "artist:benishouga",
         "artist:benisuzume",
+        "artist:benito jacovitti",
         "artist:benjamin",
         "artist:benjamin ochoa",
         "artist:benjamin rodriguez",
@@ -1257,6 +1263,7 @@ object Artist : TagList {
         "artist:c2",
         "artist:c7 hiji",
         "artist:c7 side",
+        "artist:cachic",
         "artist:caddy is raddy",
         "artist:caffeccino",
         "artist:cai pi jun",
@@ -1307,6 +1314,7 @@ object Artist : TagList {
         "artist:cassandra",
         "artist:cat o ninetails",
         "artist:catapult",
+        "artist:caterina pizarro droguett",
         "artist:caterpillar",
         "artist:catgirl witch",
         "artist:cathymouse",
@@ -1518,6 +1526,7 @@ object Artist : TagList {
         "artist:commander rab",
         "artist:comoda",
         "artist:complete alienation",
+        "artist:con narita",
         "artist:conami shoko",
         "artist:conny valentina",
         "artist:conodonts",
@@ -1629,6 +1638,7 @@ object Artist : TagList {
         "artist:daigaijin",
         "artist:daihuku",
         "artist:daimon masamasa",
+        "artist:daimong",
         "artist:dairoku byotou",
         "artist:dairoku tenmaou great",
         "artist:daisaku",
@@ -1696,12 +1706,14 @@ object Artist : TagList {
         "artist:dashahead",
         "artist:data",
         "artist:datamining",
+        "artist:datareaper",
         "artist:datarou",
         "artist:dauwe",
         "artist:davalish",
         "artist:dave cheung",
         "artist:dave johnson",
         "artist:dave yerushalaim",
+        "artist:david dong",
         "artist:david dunstan",
         "artist:david frangioso",
         "artist:david lima",
@@ -1795,9 +1807,12 @@ object Artist : TagList {
         "artist:dimitar voinov jr.",
         "artist:dimitri",
         "artist:disneyfansl",
+        "artist:dissident-hellion",
         "artist:ditama bow",
         "artist:dixon kuntz",
         "artist:dizzi morhlis",
+        "artist:djqn",
+        "artist:dkaze",
         "artist:dkdevil",
         "artist:dkir",
         "artist:dksk30",
@@ -1893,6 +1908,7 @@ object Artist : TagList {
         "artist:dr.raisuke",
         "artist:drachef",
         "artist:dragodraconis",
+        "artist:dragolord19d",
         "artist:dragon",
         "artist:dragon-fangx",
         "artist:dragon6",
@@ -1986,6 +2002,9 @@ object Artist : TagList {
         "artist:eduuux",
         "artist:edward arseneault",
         "artist:edwolfdog",
+    )
+
+    override fun getTags2(): List<String> = listOf(
         "artist:eeee",
         "artist:efren david juarez castillo",
         "artist:egawa hiromi",
@@ -2002,9 +2021,6 @@ object Artist : TagList {
         "artist:eitaisa",
         "artist:eitchna",
         "artist:ekakibit",
-    )
-
-    override fun getTags2(): List<String> = listOf(
         "artist:ekataraf",
         "artist:el at tewi",
         "artist:el bondage",
@@ -2139,6 +2155,7 @@ object Artist : TagList {
         "artist:ex-buster-wolf",
         "artist:exa takahito",
         "artist:exile factory",
+        "artist:exmile",
         "artist:expand-blurples",
         "artist:extreme",
         "artist:eyxxx",
@@ -2198,6 +2215,7 @@ object Artist : TagList {
         "artist:figgylicious",
         "artist:fight fight chiharu",
         "artist:filippo scozzari",
+        "artist:fin nomore",
         "artist:finders-keepers",
         "artist:finister foul",
         "artist:fire penguin disco panda",
@@ -2398,6 +2416,7 @@ object Artist : TagList {
         "artist:futanyanri",
         "artist:futaori arisa",
         "artist:futatsuki hisame",
+        "artist:futatsuno-peanuts",
         "artist:futou ryouko",
         "artist:futsu iyu",
         "artist:futtsu misaki",
@@ -2471,6 +2490,7 @@ object Artist : TagList {
         "artist:gei oji",
         "artist:geier robi",
         "artist:geistbox",
+        "artist:gekimabu",
         "artist:gekko mango",
         "artist:gel",
         "artist:gelatin",
@@ -2505,6 +2525,7 @@ object Artist : TagList {
         "artist:gia222n",
         "artist:gianni bono",
         "artist:gibachan",
+        "artist:gibb-san",
         "artist:gigokku",
         "artist:gilbert garnon",
         "artist:gilbert hernandez",
@@ -2552,6 +2573,7 @@ object Artist : TagList {
         "artist:gold member",
         "artist:goldcrustedchicken",
         "artist:golgi bon",
+        "artist:goliath thunderstep",
         "artist:gomabura",
         "artist:gomako",
         "artist:gomaperopero",
@@ -2634,6 +2656,7 @@ object Artist : TagList {
         "artist:grundelsmooch",
         "artist:gssm",
         "artist:gt",
+        "artist:gts tamago",
         "artist:guaky",
         "artist:guardianslade",
         "artist:guatai guatai",
@@ -2655,6 +2678,7 @@ object Artist : TagList {
         "artist:gunnjou",
         "artist:gunreibu chou 31",
         "artist:gunzan",
+        "artist:guo dong buding",
         "artist:gura nyuutou",
         "artist:guranitto",
         "artist:gurasion",
@@ -2686,9 +2710,11 @@ object Artist : TagList {
         "artist:h-o-t-cat",
         "artist:h-panda",
         "artist:h0tsh0t",
+        "artist:h2so3",
         "artist:haba hirokazu",
         "artist:hachimaki kentaro",
         "artist:hachimitsu cute",
+        "artist:hachimiya",
         "artist:hachirobee",
         "artist:hachiya makoto",
         "artist:hachuu rui",
@@ -2711,6 +2737,7 @@ object Artist : TagList {
         "artist:hagio nobuto",
         "artist:hagiwara studio",
         "artist:hagiwara yutarou",
+        "artist:hagiyoshi",
         "artist:hagure tanishi",
         "artist:hahaha",
         "artist:haida soutarou",
@@ -2751,6 +2778,7 @@ object Artist : TagList {
         "artist:hamigaki shinji",
         "artist:hamori takashi",
         "artist:hamoto",
+        "artist:hamunezuko",
         "artist:hamunohei",
         "artist:hamura wataru",
         "artist:hana hook",
@@ -2775,10 +2803,13 @@ object Artist : TagList {
         "artist:hanawa kazuichi",
         "artist:hanawakaba",
         "artist:hanazawa rena",
+        "artist:handai",
         "artist:hanetsuki tokei",
+        "artist:hangesho",
         "artist:hanikura un",
         "artist:haniwa dako",
         "artist:hankuri",
+        "artist:hanny",
         "artist:hanomido",
         "artist:hanon",
         "artist:hans christian borrebach",
@@ -3232,6 +3263,7 @@ object Artist : TagList {
         "artist:hyung tae kim",
         "artist:i am nude",
         "artist:i.heart.n.y.",
+        "artist:ia1010",
         "artist:iahfy",
         "artist:ian samson",
         "artist:ibara-d",
@@ -3326,6 +3358,7 @@ object Artist : TagList {
         "artist:imofuki",
         "artist:imomushi",
         "artist:imortal",
+        "artist:imotaco nankin",
         "artist:imp underneath",
         "artist:imsmexyftw",
         "artist:ina harakiri",
@@ -3570,6 +3603,7 @@ object Artist : TagList {
         "artist:jaime brocal remohi",
         "artist:jairou",
         "artist:jajala",
+        "artist:jake",
         "artist:jakensitou",
         "artist:jakethegoat",
         "artist:jakou nezumi",
@@ -3629,6 +3663,7 @@ object Artist : TagList {
         "artist:jenigata",
         "artist:jeremy bastian",
         "artist:jeremy bernal",
+        "artist:jerome daviau",
         "artist:jerry t.n. thompson",
         "artist:jess fink",
         "artist:jesse powell",
@@ -3692,6 +3727,7 @@ object Artist : TagList {
         "artist:joe sinister",
         "artist:joey vegas",
         "artist:john fox",
+        "artist:john james audubon",
         "artist:john joseco",
         "artist:john k. pe-ta",
         "artist:john m. burns",
@@ -3745,6 +3781,7 @@ object Artist : TagList {
         "artist:joumu",
         "artist:jounouchi nene",
         "artist:joushi",
+        "artist:jouyama yui",
         "artist:jovejun.",
         "artist:joy lewds",
         "artist:joy ride",
@@ -3780,6 +3817,7 @@ object Artist : TagList {
         "artist:juuichi gatsu",
         "artist:juusangatsu",
         "artist:jyaian",
+        "artist:jyantaku",
         "artist:jyoka",
         "artist:jyositu",
         "artist:jyoudan koto",
@@ -3813,9 +3851,11 @@ object Artist : TagList {
         "artist:kadota issei",
         "artist:kaduchi",
         "artist:kae-est",
+        "artist:kaedeno yuu",
         "artist:kaemantis",
         "artist:kaen",
         "artist:kaerudx",
+        "artist:kagawa yusaku",
         "artist:kage-no-koubou",
         "artist:kagechin",
         "artist:kagehara hanzou",
@@ -3965,6 +4005,9 @@ object Artist : TagList {
         "artist:kanitoon",
         "artist:kaniya shiku",
         "artist:kanmu ryou",
+    )
+
+    override fun getTags3(): List<String> = listOf(
         "artist:kanna",
         "artist:kannaduki hato",
         "artist:kannagi kyouichi",
@@ -4005,12 +4048,10 @@ object Artist : TagList {
         "artist:karasuuri",
         "artist:karateka value",
         "artist:karen",
-    )
-
-    override fun getTags3(): List<String> = listOf(
         "artist:karen kyuu",
         "artist:kari",
         "artist:karino hasumi",
+        "artist:karishide notto",
         "artist:karisma",
         "artist:kariya akane",
         "artist:karla groth",
@@ -4051,6 +4092,7 @@ object Artist : TagList {
         "artist:katagiri hinata",
         "artist:katagiri hinoka",
         "artist:katakuri-ko",
+        "artist:katamiki u-toy",
         "artist:katana1937",
         "artist:kataoka ryousuke",
         "artist:katase minami",
@@ -4292,6 +4334,7 @@ object Artist : TagList {
         "artist:kinnotama",
         "artist:kino jaggernov",
         "artist:kinohara hikaru",
+        "artist:kinoko utarou",
         "artist:kinokomushi",
         "artist:kinokonokko",
         "artist:kinokoyun",
@@ -4403,6 +4446,8 @@ object Artist : TagList {
         "artist:kizuki aruchu",
         "artist:kj",
         "artist:kjartan arnorsson",
+        "artist:kkaeshi",
+        "artist:kkasi",
         "artist:kkyz13",
         "artist:klaus doberman",
         "artist:klaus neu",
@@ -4433,6 +4478,8 @@ object Artist : TagList {
         "artist:kobi-tfs",
         "artist:kobucha",
         "artist:kobuchi koki",
+        "artist:koda1ra",
+        "artist:kodaibun akira",
         "artist:kodaira hiroshi",
         "artist:kodaka kazuma",
         "artist:kodama naoko",
@@ -4445,6 +4492,7 @@ object Artist : TagList {
         "artist:kogaino",
         "artist:kogaku kazuya",
         "artist:kogakunama itohiro",
+        "artist:kogame futsu",
         "artist:kogarasumaru",
         "artist:kogawa masayoshi",
         "artist:kogawa seiji",
@@ -4485,6 +4533,7 @@ object Artist : TagList {
         "artist:kokumotsu",
         "artist:kokumotu suiren",
         "artist:kokuryuugan",
+        "artist:kokutou ruu",
         "artist:kokyo k",
         "artist:komagata",
         "artist:komagata440",
@@ -4509,6 +4558,8 @@ object Artist : TagList {
         "artist:kon-kit",
         "artist:konata",
         "artist:konata hyuura",
+        "artist:konayama kata",
+        "artist:konbu",
         "artist:konbu plus",
         "artist:kondas peter",
         "artist:kondoh rururu",
@@ -4637,6 +4688,7 @@ object Artist : TagList {
         "artist:kuma-x",
         "artist:kumada",
         "artist:kumada kazushi",
+        "artist:kumada makoto",
         "artist:kumamoto aichi",
         "artist:kumanosora",
         "artist:kumao",
@@ -4684,6 +4736,7 @@ object Artist : TagList {
         "artist:kuretaishi",
         "artist:kuri dango-ya sora",
         "artist:kuribayashi chris",
+        "artist:kurigami",
         "artist:kurimoti tiduru",
         "artist:kurinton",
         "artist:kurione",
@@ -4822,6 +4875,7 @@ object Artist : TagList {
         "artist:kyuukon",
         "artist:kyuushoku",
         "artist:kz",
+        "artist:l. fy qiyu",
         "artist:lab rat",
         "artist:labui",
         "artist:lact mangan",
@@ -4866,6 +4920,7 @@ object Artist : TagList {
         "artist:lee you jung",
         "artist:lefthand",
         "artist:legoman",
+        "artist:leinad",
         "artist:leli",
         "artist:lemon font",
         "artist:lemonteapot",
@@ -4968,6 +5023,7 @@ object Artist : TagList {
         "artist:luberne",
         "artist:luca tarlazzi",
         "artist:luccatoasty",
+        "artist:lucifina 006",
         "artist:lucio filippucci",
         "artist:lucusold",
         "artist:lucy fuchs",
@@ -5061,6 +5117,7 @@ object Artist : TagList {
         "artist:magical bandai",
         "artist:magifuro konnyaku",
         "artist:magister",
+        "artist:magisterium",
         "artist:magnificent arsehole",
         "artist:magnificent sexy gals",
         "artist:magnolia-baillon",
@@ -5133,6 +5190,7 @@ object Artist : TagList {
         "artist:mancoin",
         "artist:mandi.o",
         "artist:mandiflick",
+        "artist:mando logica",
         "artist:mangneto",
         "artist:maniacalcarrot",
         "artist:manji yamada",
@@ -5164,6 +5222,7 @@ object Artist : TagList {
         "artist:maren",
         "artist:mari-v",
         "artist:mari945",
+        "artist:marielo",
         "artist:mariezone",
         "artist:marik azemus",
         "artist:mario",
@@ -5224,6 +5283,7 @@ object Artist : TagList {
         "artist:mashu maro",
         "artist:mashuroo",
         "artist:mashuuko",
+        "artist:maskwolf",
         "artist:massimo rotundo",
         "artist:master maichin",
         "artist:master of cunny",
@@ -5234,6 +5294,7 @@ object Artist : TagList {
         "artist:masuda tsuyoshi",
         "artist:masugitsune",
         "artist:masujima kensue",
+        "artist:mat remses",
         "artist:mataaro",
         "artist:matanuki",
         "artist:matashita kintama",
@@ -5323,7 +5384,6 @@ object Artist : TagList {
         "artist:mbhen114",
         "artist:mbirdcz",
         "artist:mcflytheyella",
-        "artist:mckago",
         "artist:mcrc science",
         "artist:mda starou",
         "artist:mdakoki",
@@ -5374,6 +5434,7 @@ object Artist : TagList {
         "artist:metal owl",
         "artist:metal-renamon",
         "artist:metallican",
+        "artist:metalslayer",
         "artist:meten",
         "artist:methonium",
         "artist:metrinome",
@@ -5428,6 +5489,7 @@ object Artist : TagList {
         "artist:miduta nashiko",
         "artist:mifune seijirou",
         "artist:migi rider",
+        "artist:migihane",
         "artist:miginer",
         "artist:miginohito mitsuru",
         "artist:mignon",
@@ -5490,6 +5552,7 @@ object Artist : TagList {
         "artist:milk melon",
         "artist:milkcow",
         "artist:milkybot",
+        "artist:milkymoo",
         "artist:milo manara",
         "artist:mimamoriencyo",
         "artist:mimasaka hideaki",
@@ -5561,6 +5624,7 @@ object Artist : TagList {
         "artist:mirai hikari",
         "artist:miranda leigh",
         "artist:mirco cabbia",
+        "artist:mirei",
         "artist:mirin fu-ka",
         "artist:mirka andolfo",
         "artist:mirka lugosi",
@@ -5574,6 +5638,7 @@ object Artist : TagList {
         "artist:misaki yukihiro",
         "artist:misaki yuu",
         "artist:misasagi task",
+        "artist:misato miyu",
         "artist:misato you",
         "artist:misawa hiroko",
         "artist:miscon",
@@ -5607,6 +5672,7 @@ object Artist : TagList {
         "artist:mitauo reiichi",
         "artist:mitei",
         "artist:mitgard knight",
+        "artist:miton 39",
         "artist:mitora",
         "artist:mitori iro",
         "artist:mitsu king",
@@ -5761,6 +5827,7 @@ object Artist : TagList {
         "artist:moekibara fumitake",
         "artist:mofumofu",
         "artist:mofuriru",
+        "artist:mogemoge",
         "artist:mogiki hayami",
         "artist:mohamed aouamri",
         "artist:moiarte",
@@ -5782,6 +5849,7 @@ object Artist : TagList {
         "artist:molybdenumgp03",
         "artist:momi oji",
         "artist:momia hair",
+        "artist:momico",
         "artist:momitu",
         "artist:momizi inori",
         "artist:momizi-kei",
@@ -5914,8 +5982,10 @@ object Artist : TagList {
         "artist:mr. jer",
         "artist:mr. phoenyxx",
         "artist:mr. x-toon",
+        "artist:mr.chungus",
         "artist:mr.lostman",
         "artist:mr.moudan",
+        "artist:mr.sweetcuckhold",
         "artist:mr.way",
         "artist:mrbooshmaster",
         "artist:mrbudguy",
@@ -5938,75 +6008,5 @@ object Artist : TagList {
         "artist:mubi juno",
         "artist:mucchiri chanbon",
         "artist:mucco",
-        "artist:mucha",
-        "artist:muchi maro",
-        "artist:muchuukai",
-        "artist:muffinmajima",
-        "artist:mugen no ossan",
-        "artist:mugen-dai",
-        "artist:mugicya world",
-        "artist:muhboobz",
-        "artist:muhny",
-        "artist:muichimon",
-        "artist:mukade melibe",
-        "artist:mukai masayoshi",
-        "artist:mukat",
-        "artist:mukatsuku",
-        "artist:mukka",
-        "artist:mukouhara shiryu",
-        "artist:mukoujima tenro",
-        "artist:muku",
-        "artist:mulduck",
-        "artist:mumu the lion",
-        "artist:munashimujou",
-        "artist:munitin",
-        "artist:munomerikun",
-        "artist:munyuu",
-        "artist:mura",
-        "artist:mura chloe",
-        "artist:muraachi",
-        "artist:murai renji",
-        "artist:murakami maki",
-        "artist:murakami masaki",
-        "artist:murakami shisura",
-        "artist:murakami suigun",
-        "artist:murakami teruaki",
-        "artist:muramurabito",
-        "artist:murasaki",
-        "artist:murasaki nyaa",
-        "artist:murasaki syu",
-        "artist:murasakino misato",
-        "artist:murasame fran",
-        "artist:murasame maru",
-        "artist:murasame masumi",
-        "artist:murasameblade",
-        "artist:murasan",
-        "artist:muraso shunichi",
-        "artist:murata range",
-        "artist:murata taichi",
-        "artist:murata tomohide",
-        "artist:murata yuusuke",
-        "artist:muren",
-        "artist:murlachrot",
-        "artist:muroku",
-        "artist:muronaga chaashuu",
-        "artist:musahiya",
-        "artist:musashi daichi",
-        "artist:musashino sekai",
-        "artist:musasiya chogenbo",
-        "artist:muscleman",
-        "artist:musen-shiki sanhankikan",
-        "artist:mush",
-        "artist:mushimaro",
-        "artist:musikalgenius",
-        "artist:musouduki",
-        "artist:mutantprawn",
-        "artist:mutou keiji",
-        "artist:mutou mato",
-        "artist:mutou mayuki",
-        "artist:mutou tetsu",
-        "artist:mutsuki",
-        "artist:mutsuki lime",
-        "artist:mutsuki ooyashima",
     )
 }
diff --git a/app/src/main/java/exh/eh/tags/Artist2.kt b/app/src/main/java/exh/eh/tags/Artist2.kt
index 01c4ffa9a..3a1030fb6 100644
--- a/app/src/main/java/exh/eh/tags/Artist2.kt
+++ b/app/src/main/java/exh/eh/tags/Artist2.kt
@@ -2,6 +2,77 @@ package exh.eh.tags
 
 object Artist2 : TagList {
     override fun getTags1(): List<String> = listOf(
+        "artist:mucha",
+        "artist:muchi maro",
+        "artist:muchuukai",
+        "artist:muffinmajima",
+        "artist:mugen no ossan",
+        "artist:mugen-dai",
+        "artist:mugicya world",
+        "artist:muhboobz",
+        "artist:muhny",
+        "artist:muichimon",
+        "artist:mukade melibe",
+        "artist:mukai masayoshi",
+        "artist:mukat",
+        "artist:mukatsuku",
+        "artist:mukka",
+        "artist:mukouhara shiryu",
+        "artist:mukoujima tenro",
+        "artist:muku",
+        "artist:mulduck",
+        "artist:mumu the lion",
+        "artist:munashimujou",
+        "artist:munitin",
+        "artist:munomerikun",
+        "artist:munyuu",
+        "artist:mura",
+        "artist:mura chloe",
+        "artist:muraachi",
+        "artist:murai renji",
+        "artist:murakami maki",
+        "artist:murakami masaki",
+        "artist:murakami shisura",
+        "artist:murakami suigun",
+        "artist:murakami teruaki",
+        "artist:muramurabito",
+        "artist:murasaki",
+        "artist:murasaki nyaa",
+        "artist:murasaki shingou",
+        "artist:murasaki syu",
+        "artist:murasakino misato",
+        "artist:murasame fran",
+        "artist:murasame maru",
+        "artist:murasame masumi",
+        "artist:murasameblade",
+        "artist:murasan",
+        "artist:muraso shunichi",
+        "artist:murata range",
+        "artist:murata taichi",
+        "artist:murata tomohide",
+        "artist:murata yuusuke",
+        "artist:muren",
+        "artist:murlachrot",
+        "artist:muroku",
+        "artist:muronaga chaashuu",
+        "artist:musahiya",
+        "artist:musashi daichi",
+        "artist:musashino sekai",
+        "artist:musasiya chogenbo",
+        "artist:muscleman",
+        "artist:musen-shiki sanhankikan",
+        "artist:mush",
+        "artist:mushimaro",
+        "artist:musikalgenius",
+        "artist:musouduki",
+        "artist:mutantprawn",
+        "artist:mutou keiji",
+        "artist:mutou mato",
+        "artist:mutou mayuki",
+        "artist:mutou tetsu",
+        "artist:mutsuki",
+        "artist:mutsuki lime",
+        "artist:mutsuki ooyashima",
         "artist:mutsuki tsutomu",
         "artist:mutsutake",
         "artist:mutuki shin",
@@ -23,6 +94,7 @@ object Artist2 : TagList {
         "artist:myuk",
         "artist:myuratch",
         "artist:mz09",
+        "artist:n u t",
         "artist:n. dofline",
         "artist:n.o. chachamaru",
         "artist:n.w.f.",
@@ -42,6 +114,7 @@ object Artist2 : TagList {
         "artist:nagai go",
         "artist:nagai wataru",
         "artist:nagaikusa",
+        "artist:naganine",
         "artist:nagano akane",
         "artist:nagano mamoru",
         "artist:nagao yamahiko",
@@ -126,9 +199,11 @@ object Artist2 : TagList {
         "artist:nakoudo",
         "artist:nakta",
         "artist:nakura yasuhiro",
+        "artist:namae no nai kaibutsu",
         "artist:namae renraku",
         "artist:namagaki okami",
         "artist:namahagure",
+        "artist:namahiyu",
         "artist:namakura makibishi",
         "artist:namaman",
         "artist:namamo nanase",
@@ -430,6 +505,7 @@ object Artist2 : TagList {
         "artist:nishio tetsuya",
         "artist:nishitsuki tsutomu",
         "artist:nishiuri warito",
+        "artist:nishiwaki yuuri",
         "artist:nishiyama ryouji",
         "artist:nishiyama yuichi",
         "artist:nishizaki eimu",
@@ -439,6 +515,7 @@ object Artist2 : TagList {
         "artist:nitoh yuhsa",
         "artist:nitouhen",
         "artist:nitrile",
+        "artist:nitropunk",
         "artist:nitrotitan",
         "artist:nitta jun",
         "artist:nitta kako",
@@ -503,6 +580,7 @@ object Artist2 : TagList {
         "artist:nora higuma",
         "artist:nora shinji",
         "artist:norakuro nero",
+        "artist:noraneko nicole",
         "artist:norberto fernandez",
         "artist:nord fantasy",
         "artist:nori gorou",
@@ -532,6 +610,7 @@ object Artist2 : TagList {
         "artist:ntr",
         "artist:ntrman",
         "artist:nu-",
+        "artist:nuchitaro",
         "artist:nucomas",
         "artist:nudtawut thongmai",
         "artist:nuebeam",
@@ -649,6 +728,7 @@ object Artist2 : TagList {
         "artist:ohtsuki tohru",
         "artist:ohuton",
         "artist:oi shibako",
+        "artist:oidzuka",
         "artist:oira wa armadillo",
         "artist:oji",
         "artist:ojigi",
@@ -714,6 +794,8 @@ object Artist2 : TagList {
         "artist:omiart",
         "artist:omny87",
         "artist:omori unko",
+        "artist:omucchan",
+        "artist:omulet tomato",
         "artist:on",
         "artist:on fan",
         "artist:onaka sukisuki",
@@ -858,6 +940,7 @@ object Artist2 : TagList {
         "artist:otsuka rei",
         "artist:otsumu ga party",
         "artist:otto",
+        "artist:ottone puff",
         "artist:ottorisu",
         "artist:otty the notty",
         "artist:otumaru",
@@ -890,6 +973,7 @@ object Artist2 : TagList {
         "artist:ozaki akira",
         "artist:ozaki miray",
         "artist:ozawa tadashi",
+        "artist:ozi8",
         "artist:ozora ituki",
         "artist:ozuma kumosuke",
         "artist:ozumaro",
@@ -1192,6 +1276,7 @@ object Artist2 : TagList {
         "artist:ra",
         "artist:ra-men",
         "artist:raaayama",
+        "artist:rabadash ii",
         "artist:rabies t lagomorph",
         "artist:rached",
         "artist:radasus nailo",
@@ -1218,6 +1303,7 @@ object Artist2 : TagList {
         "artist:rakujin",
         "artist:rakuoh marsh",
         "artist:rakuto yuika",
+        "artist:rald",
         "artist:raldu",
         "artist:ralf konig",
         "artist:ralphieboy",
@@ -1234,8 +1320,10 @@ object Artist2 : TagList {
         "artist:ramon torrents",
         "artist:ramototu",
         "artist:rampage",
+        "artist:ramuda",
         "artist:ramzyuu caelyn",
         "artist:ranarchy",
+        "artist:randgris",
         "artist:random",
         "artist:randomboobguy",
         "artist:randomrandom",
@@ -1266,6 +1354,7 @@ object Artist2 : TagList {
         "artist:re shimashima",
         "artist:re-maker",
         "artist:readyart",
+        "artist:realium",
         "artist:realti1",
         "artist:reaper3d",
         "artist:reapersun",
@@ -1278,6 +1367,7 @@ object Artist2 : TagList {
         "artist:red rad rebel",
         "artist:red romanov",
         "artist:red-j",
+        "artist:red-lj",
         "artist:red-rum",
         "artist:reda",
         "artist:redantarts",
@@ -1295,6 +1385,7 @@ object Artist2 : TagList {
         "artist:redneo117",
         "artist:redout",
         "artist:redren",
+        "artist:redvenvs",
         "artist:redwallfan2000",
         "artist:regdic",
         "artist:rei do",
@@ -1315,6 +1406,7 @@ object Artist2 : TagList {
         "artist:ren",
         "artist:renaissance of chaos",
         "artist:render-fox",
+        "artist:renetan",
         "artist:renn sport",
         "artist:renshiro",
         "artist:rerex101",
@@ -1418,6 +1510,7 @@ object Artist2 : TagList {
         "artist:romain slocombe",
         "artist:roman papsuev",
         "artist:romm",
+        "artist:rommi",
         "artist:rommy villamil",
         "artist:romulo mancin",
         "artist:ronald",
@@ -1426,6 +1519,7 @@ object Artist2 : TagList {
         "artist:rookie bear",
         "artist:rorimo",
         "artist:rorotuki",
+        "artist:roru keikakujo",
         "artist:roshea",
         "artist:ross",
         "artist:rossteddy",
@@ -1471,6 +1565,7 @@ object Artist2 : TagList {
         "artist:russ platt",
         "artist:russia no dassouhei",
         "artist:rustle",
+        "artist:rusty riff",
         "artist:rusty soul",
         "artist:ruuen rouga",
         "artist:ruuku",
@@ -1531,6 +1626,7 @@ object Artist2 : TagList {
         "artist:s-i-g",
         "artist:s. clay wilson",
         "artist:s. nordahl",
+        "artist:s. rena raziel",
         "artist:s. zenith lee",
         "artist:s.o.s.",
         "artist:s.p.k",
@@ -1548,6 +1644,7 @@ object Artist2 : TagList {
         "artist:saburou",
         "artist:sabusuka",
         "artist:sacha",
+        "artist:sachinon",
         "artist:sada ko-ji",
         "artist:sadagorou",
         "artist:sadakage",
@@ -1693,10 +1790,12 @@ object Artist2 : TagList {
         "artist:salomon grundig",
         "artist:salpin",
         "artist:salt marimo",
+        "artist:saltydanshark",
         "artist:sam ashton",
         "artist:sam smith",
         "artist:same manma",
         "artist:sameba ikuya",
+        "artist:samekuma",
         "artist:samerupa",
         "artist:samidare setsuna",
         "artist:samidori nana",
@@ -1797,6 +1896,7 @@ object Artist2 : TagList {
         "artist:satou masa",
         "artist:satou mitsuki",
         "artist:satou murasame eitaroh",
+        "artist:satou nikki",
         "artist:satou odori",
         "artist:satou saori",
         "artist:satou shouji",
@@ -1873,6 +1973,7 @@ object Artist2 : TagList {
         "artist:seiichiro kawaura",
         "artist:seika rhea",
         "artist:seina anji",
+        "artist:seinikuten",
         "artist:seishoujo",
         "artist:seiten taisei",
         "artist:seiya",
@@ -1901,6 +2002,9 @@ object Artist2 : TagList {
         "artist:sengoku aky",
         "artist:sengoku-kun",
         "artist:senke kagero",
+    )
+
+    override fun getTags2(): List<String> = listOf(
         "artist:senkou-maru",
         "artist:senno knife",
         "artist:sennohito.",
@@ -1912,6 +2016,7 @@ object Artist2 : TagList {
         "artist:seo miinosuke",
         "artist:sera tooru",
         "artist:serei teru",
+        "artist:seres ryu",
         "artist:sergei",
         "artist:sergey bogachoff",
         "artist:sergio arino",
@@ -1997,14 +2102,12 @@ object Artist2 : TagList {
         "artist:shibuya sicago",
         "artist:shichi ouji",
         "artist:shichuu",
+        "artist:shidatsu takayuki",
         "artist:shiden",
         "artist:shiden akira",
         "artist:shiden hiro",
         "artist:shido mayuru",
         "artist:shiga kenta",
-    )
-
-    override fun getTags2(): List<String> = listOf(
         "artist:shiga retsuto",
         "artist:shiganai might",
         "artist:shigehira",
@@ -2067,6 +2170,7 @@ object Artist2 : TagList {
         "artist:shimazaki lem",
         "artist:shimazu tekko",
         "artist:shimeji",
+        "artist:shimetsuki tanki",
         "artist:shimetta masuta",
         "artist:shimimaru",
         "artist:shimizu kiyoshi",
@@ -2077,6 +2181,7 @@ object Artist2 : TagList {
         "artist:shimosan",
         "artist:shimuu",
         "artist:shin tsuguru",
+        "artist:shin valentine",
         "artist:shinade kuro",
         "artist:shinama",
         "artist:shinano rurusa",
@@ -2163,6 +2268,7 @@ object Artist2 : TagList {
         "artist:shirohebidou",
         "artist:shiroi eriko",
         "artist:shiroi gunpan",
+        "artist:shiroi yoru",
         "artist:shiroie mika",
         "artist:shirokimochi",
         "artist:shirokuma douji",
@@ -2256,6 +2362,7 @@ object Artist2 : TagList {
         "artist:siggy",
         "artist:sigmax",
         "artist:signirsol",
+        "artist:signo mandara",
         "artist:signum",
         "artist:sigurdhosenfeld",
         "artist:siina tai",
@@ -2310,6 +2417,7 @@ object Artist2 : TagList {
         "artist:siromine",
         "artist:sironn",
         "artist:sirosaki aroe",
+        "artist:sirotayunikon",
         "artist:siroyuki",
         "artist:siscom",
         "artist:sisei tokei",
@@ -2325,6 +2433,7 @@ object Artist2 : TagList {
         "artist:sketch lanza",
         "artist:sketchy behaviour",
         "artist:sketchy skylar",
+        "artist:skill",
         "artist:skillet91",
         "artist:skltn",
         "artist:skullworms",
@@ -2370,11 +2479,13 @@ object Artist2 : TagList {
         "artist:snowmi",
         "artist:snowspecter",
         "artist:snyp",
+        "artist:soboro",
         "artist:soborogo",
         "artist:soejima shigenori",
         "artist:softcharm",
         "artist:softschwarz",
         "artist:sogabe toshinori",
+        "artist:sogom",
         "artist:sohya",
         "artist:sokutenkun",
         "artist:sol goodguy",
@@ -2475,6 +2586,7 @@ object Artist2 : TagList {
         "artist:star chaser",
         "artist:star741",
         "artist:starcross",
+        "artist:stargazer",
         "artist:stargraves",
         "artist:starring",
         "artist:stealth changing line",
@@ -2528,8 +2640,8 @@ object Artist2 : TagList {
         "artist:sugimoto ami",
         "artist:sugimura haruya",
         "artist:sugisaki yukiru",
+        "artist:sugitani kouji",
         "artist:sugitomo kazuhiro",
-        "artist:sugiura sen",
         "artist:sugiyama genshou",
         "artist:sugou hiroyuki",
         "artist:suguru ouji",
@@ -2590,6 +2702,7 @@ object Artist2 : TagList {
         "artist:susugu",
         "artist:susuki",
         "artist:suta furachina",
+        "artist:sutada",
         "artist:suto",
         "artist:suwa atsushi",
         "artist:suwa kunimitsu",
@@ -2615,6 +2728,7 @@ object Artist2 : TagList {
         "artist:suzunone kanata",
         "artist:suzushiro",
         "artist:suzushiro seri",
+        "artist:suzusimo",
         "artist:suzutsuki kurara",
         "artist:sw",
         "artist:swagalicious tony",
@@ -2865,6 +2979,7 @@ object Artist2 : TagList {
         "artist:tanaka yutaka",
         "artist:tanaka-ex",
         "artist:tanakana",
+        "artist:tanba toki",
         "artist:taneichi",
         "artist:tanemura arina",
         "artist:tanenashi kuribo",
@@ -2967,7 +3082,9 @@ object Artist2 : TagList {
         "artist:tenjiku rounin",
         "artist:tenjin hidetaka",
         "artist:tenjo ryuka",
+        "artist:tenkyou ryuune",
         "artist:tenpuu mitsunari",
+        "artist:tenrai x",
         "artist:tensa-zangitsu",
         "artist:tensei-kun",
         "artist:tenshi juuji",
@@ -2991,6 +3108,7 @@ object Artist2 : TagList {
         "artist:terashima musi",
         "artist:terasu mc",
         "artist:terazip",
+        "artist:terazo",
         "artist:terebi",
         "artist:teresa richards",
         "artist:teri terio",
@@ -3052,6 +3170,7 @@ object Artist2 : TagList {
         "artist:thebigbadwolf01",
         "artist:thebigbrap",
         "artist:thebigmansini",
+        "artist:thed4rk1ord",
         "artist:thedirtymonkey",
         "artist:thedoodlefurry",
         "artist:thedude3dx",
@@ -3123,6 +3242,7 @@ object Artist2 : TagList {
         "artist:toastyco games",
         "artist:toba yuga",
         "artist:tobatoinu",
+        "artist:tobe",
         "artist:tobe sunaho",
         "artist:tobias levi",
         "artist:tobio takeuchi",
@@ -3211,6 +3331,7 @@ object Artist2 : TagList {
         "artist:tony kovik",
         "artist:tony taka",
         "artist:tonyman plus",
+        "artist:toobese",
         "artist:tooda shunkei",
         "artist:toono suika",
         "artist:toono yayoi",
@@ -3487,6 +3608,7 @@ object Artist2 : TagList {
         "artist:umemaru",
         "artist:umematsu thomas",
         "artist:umeo hiromori",
+        "artist:umeta",
         "artist:umetani kenji",
         "artist:umetsu yasuomi",
         "artist:umetsu yukinori",
@@ -3559,6 +3681,7 @@ object Artist2 : TagList {
         "artist:usa otome",
         "artist:usagi gyouza",
         "artist:usagi nezumi",
+        "artist:usagi oi",
         "artist:usagi star",
         "artist:usagine kobo",
         "artist:usami wataru",
@@ -3671,6 +3794,7 @@ object Artist2 : TagList {
         "artist:wacho",
         "artist:wada erika",
         "artist:wada rco",
+        "artist:wada-chin",
         "artist:wade99",
         "artist:waga na wa masamichi",
         "artist:waguchi shouka",
@@ -3760,6 +3884,7 @@ object Artist2 : TagList {
         "artist:wildblur",
         "artist:wildmeats",
         "artist:wilfried viktor herz",
+        "artist:william b",
         "artist:willy maltaite",
         "artist:wind driven",
         "artist:wing bird",
@@ -3856,6 +3981,7 @@ object Artist2 : TagList {
         "artist:yair herrera",
         "artist:yajiro masaru",
         "artist:yak",
+        "artist:yakbang",
         "artist:yaki ohagi",
         "artist:yakisobapantarou",
         "artist:yakitomato",
@@ -3879,7 +4005,11 @@ object Artist2 : TagList {
         "artist:yamada shiguma",
         "artist:yamada shouji",
         "artist:yamada shuutarou",
+    )
+
+    override fun getTags3(): List<String> = listOf(
         "artist:yamada tahichi",
+        "artist:yamada2chome",
         "artist:yamadori",
         "artist:yamagata sei",
         "artist:yamagishi ryoko",
@@ -3986,6 +4116,7 @@ object Artist2 : TagList {
         "artist:yf",
         "artist:ygo",
         "artist:yichimo",
+        "artist:yigui",
         "artist:yishan studio",
         "artist:ynorka",
         "artist:yo-jin",
@@ -4005,9 +4136,6 @@ object Artist2 : TagList {
         "artist:yoko juusuke",
         "artist:yoko mawatari",
         "artist:yokohama inka",
-    )
-
-    override fun getTags3(): List<String> = listOf(
         "artist:yokoi rego",
         "artist:yokomichigai",
         "artist:yokonyan",
diff --git a/app/src/main/java/exh/eh/tags/Character.kt b/app/src/main/java/exh/eh/tags/Character.kt
index f8a19547c..3890ab10d 100644
--- a/app/src/main/java/exh/eh/tags/Character.kt
+++ b/app/src/main/java/exh/eh/tags/Character.kt
@@ -7,6 +7,7 @@ object Character : TagList {
         "character:2b",
         "character:2k-tan",
         "character:9s",
+        "character:a-chan",
         "character:a2",
         "character:aayla secura",
         "character:abigail marston",
@@ -38,6 +39,7 @@ object Character : TagList {
         "character:agiri goshiki",
         "character:agnese sanctis",
         "character:agrias oaks",
+        "character:agunimon",
         "character:ahim de famille",
         "character:ahsoka tano",
         "character:ai amatsu",
@@ -95,6 +97,7 @@ object Character : TagList {
         "character:akari mizunashi",
         "character:akari oozora",
         "character:akari sakura",
+        "character:akari sonozaki",
         "character:akari usada",
         "character:akatsuki uni",
         "character:akemi itou",
@@ -177,6 +180,7 @@ object Character : TagList {
         "character:amagiri kazutake",
         "character:amagiri kyuju",
         "character:amalia sheran sharm",
+        "character:amanda ripley-mcclaren",
         "character:amata almodovar",
         "character:amata sora",
         "character:amber",
@@ -238,6 +242,7 @@ object Character : TagList {
         "character:annerose vajra",
         "character:annie leonhart",
         "character:annie parker",
+        "character:anshan",
         "character:ant-man",
         "character:anti",
         "character:antoine d coolette",
@@ -300,6 +305,7 @@ object Character : TagList {
         "character:artoria pendragon alter",
         "character:aru rikuhachima",
         "character:aruf",
+        "character:arukenimon",
         "character:arumi asahina",
         "character:aruru",
         "character:asa shigure",
@@ -408,6 +414,7 @@ object Character : TagList {
         "character:balsa yonsa",
         "character:balthier",
         "character:ban midou",
+        "character:bancholeomon",
         "character:bang freiheit",
         "character:banri ogami",
         "character:bansai kawakami",
@@ -501,6 +508,7 @@ object Character : TagList {
         "character:boukuu maigo hime",
         "character:boy with earring",
         "character:boyd",
+        "character:bozai",
         "character:bra",
         "character:braixen",
         "character:brandy harrington",
@@ -595,6 +603,7 @@ object Character : TagList {
         "character:chelsea rorec",
         "character:chen",
         "character:cheshire",
+        "character:cheshire cat",
         "character:chi chi",
         "character:chi-ba kun",
         "character:chiaia furan",
@@ -817,6 +826,7 @@ object Character : TagList {
         "character:dan hibiki",
         "character:dana scully",
         "character:dancing lady orchid",
+        "character:danielle dennison",
         "character:danielle moonstar",
         "character:danjuro tobita",
         "character:danny fenton",
@@ -884,6 +894,7 @@ object Character : TagList {
         "character:dr. robotnik",
         "character:dr. thaddeus venture",
         "character:dr. wily",
+        "character:dr. xeno houston wingfield",
         "character:draco centauros",
         "character:drasna",
         "character:droite",
@@ -904,6 +915,7 @@ object Character : TagList {
         "character:edward wong hau pepelu tivrusky iv",
         "character:egyptian water lily",
         "character:eiga kanmi",
+        "character:eiki shiki",
         "character:eiko carol",
         "character:eila ilmatar juutilainen",
         "character:eimi ohba",
@@ -1053,11 +1065,13 @@ object Character : TagList {
         "character:flannel",
         "character:flay allster",
         "character:fleurette",
+        "character:flintheart glomgold",
         "character:florina",
         "character:fluttershy",
         "character:flynn rider",
         "character:fm77",
         "character:fn five-seven",
+        "character:fodeth",
         "character:fonda fontaine",
         "character:fonzie",
         "character:foo fighters",
@@ -1166,6 +1180,7 @@ object Character : TagList {
         "character:glamrock freddy",
         "character:glenn quagmire",
         "character:gloria sato",
+        "character:glubba",
         "character:gluko",
         "character:go-bemiu-gi",
         "character:goddess alice",
@@ -1438,6 +1453,7 @@ object Character : TagList {
         "character:hydra bell",
         "character:hylia",
         "character:hyouka kazakiri",
+        "character:hyoun",
         "character:hyousuke nagimiya",
         "character:i-19",
         "character:i-pin",
@@ -1485,6 +1501,7 @@ object Character : TagList {
         "character:ino yamanaka",
         "character:inori yuzuriha",
         "character:io nitta",
+        "character:iono",
         "character:iori minase",
         "character:iori nagase",
         "character:iori yoshizuki",
@@ -1496,6 +1513,7 @@ object Character : TagList {
         "character:irmgult kazahara",
         "character:iron man",
         "character:irui gan eden",
+        "character:isabelle vouthon",
         "character:isai kaminogi",
         "character:isami hanaoka",
         "character:isane kotetsu",
@@ -1581,6 +1599,7 @@ object Character : TagList {
         "character:jill valentine",
         "character:jin bubaigawara",
         "character:jina wolf",
+        "character:jinan",
         "character:jinbe",
         "character:jinichirou manabe",
         "character:jinmenken",
@@ -1806,6 +1825,7 @@ object Character : TagList {
         "character:keizou amano",
         "character:kekko kamen",
         "character:kelly stownar",
+        "character:kemono-ou",
         "character:ken kaneki",
         "character:kenji kazama",
         "character:kennosuke tsurugi",
@@ -1866,6 +1886,7 @@ object Character : TagList {
         "character:kirino kousaka",
         "character:kirio amy",
         "character:kirisato",
+        "character:kiritan tohoku",
         "character:kiritsugu emiya",
         "character:kirumi tojo",
         "character:kiryu kazuma",
@@ -1974,12 +1995,16 @@ object Character : TagList {
         "character:koutarou taiga",
         "character:koutarou takebayashi",
         "character:koutarou tatsumi",
+        "character:kouwan natsuki",
         "character:kouwan seiki",
         "character:kouya aotsuki",
         "character:kouyou akizuki",
         "character:koyanskaya",
         "character:koyomi araragi",
         "character:koyomi mizuhara",
+    )
+
+    override fun getTags2(): List<String> = listOf(
         "character:koyori togashi",
         "character:koyuki azumaya",
         "character:kozo fuyutsuki",
@@ -1992,6 +2017,7 @@ object Character : TagList {
         "character:kris",
         "character:krista lenz",
         "character:kristoff bjorgman",
+        "character:krookodile",
         "character:krypto the superdog",
         "character:krystal",
         "character:ku fei",
@@ -2002,9 +2028,6 @@ object Character : TagList {
         "character:kukaku shiba",
         "character:kukuri tachibana",
         "character:kula diamond",
-    )
-
-    override fun getTags2(): List<String> = listOf(
         "character:kumako kumoike",
         "character:kumi mikuni",
         "character:kumin tsuyuri",
@@ -2781,6 +2804,8 @@ object Character : TagList {
         "character:morgan le fay",
         "character:morgan lefay",
         "character:moriah gekko",
+        "character:moritaka inuduka",
+        "character:morpho",
         "character:morrigan aensland",
         "character:morrigan the witch of the wilds",
         "character:morris lling",
@@ -2797,6 +2822,7 @@ object Character : TagList {
         "character:mr. carrot cake",
         "character:mr. gar",
         "character:mr. heartland",
+        "character:mr. mason wolf",
         "character:mr. mime",
         "character:mr. popo",
         "character:mr. saturn",
@@ -2852,6 +2878,7 @@ object Character : TagList {
         "character:nagate tanikaze",
         "character:nagi dai artai",
         "character:nagi sanzenin",
+        "character:nagisa aikawa",
         "character:nagisa aragaki",
         "character:nagisa chiba",
         "character:nagisa furukawa",
@@ -2913,6 +2940,7 @@ object Character : TagList {
         "character:natarle badgiruel",
         "character:nate argente loup mitotsudaira",
         "character:nathan joshua prescott",
+        "character:natigal",
         "character:natola einus",
         "character:natori sana",
         "character:natsu ayuhara",
@@ -3058,6 +3086,8 @@ object Character : TagList {
         "character:otonoshin koito",
         "character:otsuu tsurugaya",
         "character:ougi oshino",
+        "character:ouka kashima",
+        "character:outworld destroyer",
         "character:ovelia atkascha",
         "character:ox-king",
         "character:p.j. pete",
@@ -3170,6 +3200,7 @@ object Character : TagList {
         "character:princess of moonbrook",
         "character:princess peach",
         "character:princess pipp petals",
+        "character:princess prin prin",
         "character:princess ruto",
         "character:princess star butterfly",
         "character:princess waya",
@@ -3306,6 +3337,7 @@ object Character : TagList {
         "character:rem galleu",
         "character:remi aono",
         "character:remilia scarlet",
+        "character:ren yamai",
         "character:rena",
         "character:rena andou",
         "character:rena kariu",
@@ -3339,6 +3371,7 @@ object Character : TagList {
         "character:riesz",
         "character:rihoko sakurai",
         "character:rika ayano",
+        "character:rika domeki",
         "character:rika furude",
         "character:rika jougasaki",
         "character:rika nonaka",
@@ -3461,6 +3494,7 @@ object Character : TagList {
         "character:rustal elion",
         "character:ruuko kominato",
         "character:ryan goldsmith",
+        "character:ryle",
         "character:ryo akizuki",
         "character:ryo asuka",
         "character:ryo matsunaga",
@@ -3739,7 +3773,6 @@ object Character : TagList {
         "character:shiki ichinose",
         "character:shiki ryougi",
         "character:shiki tohno",
-        "character:shikieiki yamaxanadu",
         "character:shima katase",
         "character:shimakaze",
         "character:shimako toudou",
@@ -3768,6 +3801,7 @@ object Character : TagList {
         "character:shinobu omiya",
         "character:shinobu oshino",
         "character:shinpachi nagakura",
+        "character:shintaro aihara",
         "character:shintaro kisaragi",
         "character:shiny luminous",
         "character:shinya kougami",
@@ -3831,6 +3865,7 @@ object Character : TagList {
         "character:shredder",
         "character:shrinking violet",
         "character:shu ouma",
+        "character:shu-chi yan",
         "character:shuichi shindo",
         "character:shuko suzuhara",
         "character:shuma-gorath",
@@ -3959,6 +3994,7 @@ object Character : TagList {
         "character:suelecia zagan analeit",
         "character:sugoi doppai",
         "character:suguha kirigaya",
+        "character:suguru geto",
         "character:sui kamishiro",
         "character:suigetsu hozuki",
         "character:suigintou",
@@ -3969,6 +4005,9 @@ object Character : TagList {
         "character:sumeragi lee noriega",
         "character:sumi kuroi",
         "character:sumika kagami",
+    )
+
+    override fun getTags3(): List<String> = listOf(
         "character:sumire kakei",
         "character:sumire kanou",
         "character:sumire nono",
@@ -4005,9 +4044,6 @@ object Character : TagList {
         "character:suzune saijou",
         "character:suzuno kamazuki",
         "character:suzuya tohzuki",
-    )
-
-    override fun getTags3(): List<String> = listOf(
         "character:sweetie belle",
         "character:sweetie drops",
         "character:sword maiden",
@@ -4094,6 +4130,7 @@ object Character : TagList {
         "character:tanjirou kamado",
         "character:tanukichi okuma",
         "character:tapio chatorazawa",
+        "character:tapris sugarbell chisaki",
         "character:taranee cook",
         "character:tarnyang",
         "character:tarou misaki",
@@ -4315,6 +4352,7 @@ object Character : TagList {
         "character:utsutsu miya",
         "character:uzuki shimamura",
         "character:v",
+        "character:valeria von doom",
         "character:vambre warrior",
         "character:vampire girl",
         "character:vanellope von schweetz",
@@ -4345,6 +4383,7 @@ object Character : TagList {
         "character:vivio takamachi",
         "character:vlad the impaler",
         "character:vladilena milize",
+        "character:voy",
         "character:vt-212",
         "character:vuelo eluko",
         "character:vulpix",
@@ -4393,6 +4432,7 @@ object Character : TagList {
         "character:wonder woman",
         "character:wonrei",
         "character:wood sorrel",
+        "character:woodchuck",
         "character:wreck it ralph",
         "character:wriggle nightbug",
         "character:wu zetian",
@@ -4616,8 +4656,10 @@ object Character : TagList {
         "character:yuuma nosaka",
         "character:yuuma tokoyogi",
         "character:yuumi hoshino",
+        "character:yuuna akamine",
         "character:yuuna akashi",
         "character:yuuna mitarai",
+        "character:yuuna takashima",
         "character:yuuno houzuki",
         "character:yuuri katsuki",
         "character:yuuri kozukata",
@@ -4649,6 +4691,7 @@ object Character : TagList {
         "character:zeke",
         "character:zelgadis graywords",
         "character:zen fudou",
+        "character:zenos yae galvus",
         "character:zero two",
         "character:zhen ji",
         "character:zhurong",
diff --git a/app/src/main/java/exh/eh/tags/Cosplayer.kt b/app/src/main/java/exh/eh/tags/Cosplayer.kt
index a6040e68f..5906e1df5 100644
--- a/app/src/main/java/exh/eh/tags/Cosplayer.kt
+++ b/app/src/main/java/exh/eh/tags/Cosplayer.kt
@@ -13,6 +13,7 @@ object Cosplayer : TagList {
         "cosplayer:alodia gosiengfiao",
         "cosplayer:amanda welp",
         "cosplayer:anastasia komori",
+        "cosplayer:annie seixas",
         "cosplayer:aokotan",
         "cosplayer:arisa mizuhara",
         "cosplayer:arty huang",
@@ -25,17 +26,20 @@ object Cosplayer : TagList {
         "cosplayer:bobbi starr",
         "cosplayer:carry key",
         "cosplayer:charles dera",
+        "cosplayer:christina volkova",
         "cosplayer:chunmomo",
         "cosplayer:comonun",
         "cosplayer:danielle vedovelli",
         "cosplayer:darling cute",
         "cosplayer:dillion harper",
+        "cosplayer:dira",
         "cosplayer:donnaloli",
         "cosplayer:evenink",
         "cosplayer:fe galvao",
         "cosplayer:fluffy nemu",
         "cosplayer:franxcos",
         "cosplayer:g44 wa kizutsukanai",
+        "cosplayer:giulia valeriani",
         "cosplayer:gumiho hannya",
         "cosplayer:hane ame",
         "cosplayer:helly von valentine",
@@ -49,13 +53,17 @@ object Cosplayer : TagList {
         "cosplayer:iori moe",
         "cosplayer:ishikawa asami",
         "cosplayer:jaycee",
+        "cosplayer:jenna lynn meowri",
         "cosplayer:jessica nigri",
         "cosplayer:jill",
+        "cosplayer:jinxie",
         "cosplayer:kalinka fox",
         "cosplayer:kanda midori",
+        "cosplayer:kate key",
         "cosplayer:kaya huang",
         "cosplayer:kimmie mi",
         "cosplayer:kitami eri",
+        "cosplayer:korpsekitten",
         "cosplayer:koyama rikako",
         "cosplayer:kqueentsun",
         "cosplayer:kurumi.",
@@ -67,10 +75,14 @@ object Cosplayer : TagList {
         "cosplayer:meikoui",
         "cosplayer:miih cosplay",
         "cosplayer:mikomin",
+        "cosplayer:mingming kizami",
+        "cosplayer:minzy tea",
         "cosplayer:misa daidai",
         "cosplayer:mizhimaoqiu",
         "cosplayer:mochizuki eiko",
+        "cosplayer:mochizuki kanade",
         "cosplayer:momoiro reku",
+        "cosplayer:momoko",
         "cosplayer:momokun",
         "cosplayer:nadyasonika",
         "cosplayer:neroko kaigan",
@@ -84,6 +96,7 @@ object Cosplayer : TagList {
         "cosplayer:penkarui",
         "cosplayer:punk macarroni",
         "cosplayer:queenie",
+        "cosplayer:raynearts",
         "cosplayer:rio-chan",
         "cosplayer:rioko",
         "cosplayer:rocksy light",
@@ -108,11 +121,14 @@ object Cosplayer : TagList {
         "cosplayer:todopokie",
         "cosplayer:tsubaki zakuro",
         "cosplayer:tsuki desu",
+        "cosplayer:tsukimiya madoka",
         "cosplayer:tyouduki maryou",
         "cosplayer:uchida mahiro",
+        "cosplayer:una cosplayer",
         "cosplayer:valery himera",
         "cosplayer:velvet",
         "cosplayer:wildhoney423",
+        "cosplayer:yaoyaoqwq",
         "cosplayer:yume",
         "cosplayer:yunocos69",
         "cosplayer:yuzupyon",
diff --git a/app/src/main/java/exh/eh/tags/Female.kt b/app/src/main/java/exh/eh/tags/Female.kt
index 5dd3fd3ac..b5f4ddf53 100644
--- a/app/src/main/java/exh/eh/tags/Female.kt
+++ b/app/src/main/java/exh/eh/tags/Female.kt
@@ -61,7 +61,6 @@ object Female : TagList {
         "female:big vagina",
         "female:bike shorts",
         "female:bikini",
-        "female:birth",
         "female:bisexual",
         "female:blackmail",
         "female:blind",
@@ -155,6 +154,7 @@ object Female : TagList {
         "female:dickgirls only",
         "female:dicknipples",
         "female:dinosaur",
+        "female:dismantling",
         "female:dog",
         "female:dog girl",
         "female:doll joints",
@@ -256,6 +256,7 @@ object Female : TagList {
         "female:headless",
         "female:headphones",
         "female:heterochromia",
+        "female:hidden sex",
         "female:hijab",
         "female:hood",
         "female:horns",
@@ -275,6 +276,7 @@ object Female : TagList {
         "female:inflation",
         "female:insect",
         "female:insect girl",
+        "female:inseki",
         "female:internal urination",
         "female:inverted nipples",
         "female:invisible",
@@ -352,6 +354,7 @@ object Female : TagList {
         "female:multiple vaginas",
         "female:muscle",
         "female:muscle growth",
+        "female:mute",
         "female:nakadashi",
         "female:navel fuck",
         "female:nazi",
@@ -369,6 +372,7 @@ object Female : TagList {
         "female:octopus",
         "female:oil",
         "female:old lady",
+        "female:omorashi",
         "female:onahole",
         "female:oni",
         "female:oppai loli",
@@ -471,6 +475,7 @@ object Female : TagList {
         "female:spider",
         "female:spider girl",
         "female:squid girl",
+        "female:squirrel girl",
         "female:squirting",
         "female:ssbbw",
         "female:stewardess",
@@ -531,6 +536,7 @@ object Female : TagList {
         "female:urethra insertion",
         "female:urination",
         "female:vacbed",
+        "female:vaginal birth",
         "female:vaginal sticker",
         "female:vampire",
         "female:very long hair",
@@ -544,6 +550,7 @@ object Female : TagList {
         "female:wet clothes",
         "female:whale",
         "female:whip",
+        "female:widow",
         "female:wingjob",
         "female:wings",
         "female:witch",
diff --git a/app/src/main/java/exh/eh/tags/Group.kt b/app/src/main/java/exh/eh/tags/Group.kt
index b915166dd..bbb90e8c3 100644
--- a/app/src/main/java/exh/eh/tags/Group.kt
+++ b/app/src/main/java/exh/eh/tags/Group.kt
@@ -26,6 +26,7 @@ object Group : TagList {
         "group:102 goushitsu",
         "group:103mol per l",
         "group:105r",
+        "group:108 toufuten",
         "group:110-groove",
         "group:12-jigen",
         "group:140km slash h",
@@ -549,6 +550,7 @@ object Group : TagList {
         "group:asahiage",
         "group:asai kikaku",
         "group:asaka sangyou",
+        "group:asakasha doujin",
         "group:asakaze no shizuku",
         "group:asaki blog branch office",
         "group:asakurag plus",
@@ -881,6 +883,7 @@ object Group : TagList {
         "group:bousou fuhatsudan",
         "group:bousousuwanchika",
         "group:box",
+        "group:boycott kougyou",
         "group:boys be gakuen",
         "group:bozu lab 3",
         "group:bread and cake",
@@ -1100,6 +1103,7 @@ object Group : TagList {
         "group:chroma of wall",
         "group:chronicle",
         "group:chuable soft",
+        "group:chudy shoujo",
         "group:chunhaikan",
         "group:chupa chupa ya",
         "group:churu bitch churu churu",
@@ -1256,6 +1260,7 @@ object Group : TagList {
         "group:cyberangel",
         "group:cyborg hum",
         "group:cycle re birth",
+        "group:cyclo sabacane",
         "group:cyclo-",
         "group:cz",
         "group:d colon brand",
@@ -1375,6 +1380,7 @@ object Group : TagList {
         "group:dex plus",
         "group:dhr-ken",
         "group:diablo",
+        "group:dicpic studio",
         "group:dienchuanchu chinjufu",
         "group:dieppe factory",
         "group:dieselmine",
@@ -1523,6 +1529,7 @@ object Group : TagList {
         "group:electromagneticwave",
         "group:elephantchorus",
         "group:elf",
+        "group:elfin facies",
         "group:ellese no yakata",
         "group:emade.",
         "group:emoi-do",
@@ -1621,6 +1628,7 @@ object Group : TagList {
         "group:fetizamurai",
         "group:fiance tank",
         "group:fight",
+        "group:fighting bear",
         "group:fighting peroriina",
         "group:final fuck 7",
         "group:fire enpitsu 2gou",
@@ -1732,9 +1740,12 @@ object Group : TagList {
         "group:futabasshu",
         "group:futairo",
         "group:futaket junbikai",
+        "group:futsu-no-tapioca-yasan",
+        "group:futsukame",
         "group:fuusa ryouiki",
         "group:fuuyuu kouro",
         "group:fuwa fuwa pinkchan",
+        "group:fuwafuwa palette",
         "group:fuwamoko honpo",
         "group:fuwaten",
         "group:fuyuzora izumo",
@@ -1743,6 +1754,7 @@ object Group : TagList {
         "group:g equals kundow",
         "group:g slash l plus plus",
         "group:g-power",
+        "group:g-r",
         "group:g-scan corp.",
         "group:g-spot",
         "group:g-work at mi",
@@ -1918,6 +1930,7 @@ object Group : TagList {
         "group:guchokuya",
         "group:gul-fuh",
         "group:gumi syrup",
+        "group:gumichocomelon niku",
         "group:gun modoki",
         "group:gungnir",
         "group:gunjyou zensen",
@@ -1928,6 +1941,7 @@ object Group : TagList {
         "group:guruguru taiyo",
         "group:gurumepoppo",
         "group:gusha suumitsuin",
+        "group:gusha-angya",
         "group:gutenberg no musume",
         "group:gyakugire deka",
         "group:gyaotaro",
@@ -1961,6 +1975,7 @@ object Group : TagList {
         "group:hachimitsu zakura",
         "group:hachinosu",
         "group:hachiouji kaipan totsugeki kiheitai",
+        "group:hadairo ougonsui",
         "group:hadime studio",
         "group:hagan ken",
         "group:haiboku kamen",
@@ -1987,6 +2002,9 @@ object Group : TagList {
         "group:hakonyan.",
         "group:hakuchi shobou",
         "group:hakuchuumu",
+    )
+
+    override fun getTags2(): List<String> = listOf(
         "group:hakudaku machinegun",
         "group:hakueki shobou",
         "group:hakuginmokusei",
@@ -2002,9 +2020,6 @@ object Group : TagList {
         "group:halleluya.",
         "group:hallenchi planet",
         "group:hallucigenia",
-    )
-
-    override fun getTags2(): List<String> = listOf(
         "group:halopack",
         "group:ham string",
         "group:ham.",
@@ -2140,6 +2155,7 @@ object Group : TagList {
         "group:henreikai",
         "group:henshin heroine kenkyuujo",
         "group:henshitsusya",
+        "group:hentai tokyo",
         "group:hentai.red",
         "group:hentaikey",
         "group:hentaitna",
@@ -2163,6 +2179,7 @@ object Group : TagList {
         "group:hiatari dining",
         "group:hibi kore shoujin",
         "group:hibiki",
+        "group:hidariharai",
         "group:hidariude no mole",
         "group:hiero",
         "group:higashi no penguine",
@@ -2192,6 +2209,7 @@ object Group : TagList {
         "group:hima serval",
         "group:himawari mandiu",
         "group:himawari-noren",
+        "group:hime wanko",
         "group:himeshibori",
         "group:himeya",
         "group:himitsu kessha goruhomu",
@@ -2710,6 +2728,7 @@ object Group : TagList {
         "group:kazan no you",
         "group:kazemetafu at henshin heroine kenkyuu report",
         "group:kazoku keikaku",
+        "group:kazuba shotei",
         "group:kebero corporation",
         "group:kedamono kangoku tou",
         "group:kedamonoya san",
@@ -2747,7 +2766,7 @@ object Group : TagList {
         "group:khaos distance",
         "group:khaos wind",
         "group:kharisma jati",
-        "group:kiba o muku",
+        "group:kibawomuku",
         "group:kichiku bansankai",
         "group:kichiku koubou",
         "group:kichiku yaro",
@@ -2952,6 +2971,7 @@ object Group : TagList {
         "group:kouzaka-san to makino jimusho",
         "group:kouzu shoukai",
         "group:kouzuya",
+        "group:kowanikoya",
         "group:kowaremono",
         "group:kowareta radio",
         "group:koyumean",
@@ -3112,6 +3132,7 @@ object Group : TagList {
         "group:lesser panda ga yome",
         "group:letitia no ohirune",
         "group:level-x",
+        "group:level.41",
         "group:leymei",
         "group:lezmoe",
         "group:liar-soft",
@@ -3248,6 +3269,7 @@ object Group : TagList {
         "group:maguro bokujo",
         "group:maguro koubou",
         "group:mahiru no tsuki",
+        "group:mahiru nosora",
         "group:mahjong yugen co.ltd 58",
         "group:maho-shinsengumi",
         "group:mahou no kagi",
@@ -3285,6 +3307,7 @@ object Group : TagList {
         "group:mammoth hunt",
         "group:man chin low",
         "group:manaworld",
+        "group:mandara daiou",
         "group:mandaruma",
         "group:mandoragora striker",
         "group:mangana",
@@ -3450,6 +3473,7 @@ object Group : TagList {
         "group:midoriya",
         "group:migidenagutte",
         "group:migimagari-ya",
+        "group:miginisasetsu",
         "group:migumigu-sou",
         "group:mikadsukikansokujo",
         "group:mikan bako o koyonaku aisuru kai",
@@ -3531,6 +3555,7 @@ object Group : TagList {
         "group:mitsuya yoguru",
         "group:mittsuame",
         "group:miura jota",
+        "group:miura ryouto",
         "group:miwaku no kazitu",
         "group:miwaku-iro missile",
         "group:mix fry",
@@ -3582,6 +3607,7 @@ object Group : TagList {
         "group:mokugyuutan",
         "group:mokusa",
         "group:molossan",
+        "group:momico-san",
         "group:momijiden",
         "group:mominoki",
         "group:momizi koubou",
@@ -3756,6 +3782,7 @@ object Group : TagList {
         "group:myonlyone",
         "group:myouban",
         "group:mzfist",
+        "group:mzphi works",
         "group:n",
         "group:n and t circus-dan",
         "group:n b g",
@@ -3826,6 +3853,7 @@ object Group : TagList {
         "group:nanami-chan",
         "group:nanamiya",
         "group:nanana",
+        "group:nanao heavy industries",
         "group:nanashi kissa",
         "group:nanashi no rakugakijo",
         "group:nanashi novel",
@@ -3887,6 +3915,7 @@ object Group : TagList {
         "group:neco shounan",
         "group:necocoya",
         "group:necopillow",
+        "group:needs sox",
         "group:neetest",
         "group:nefradel s.p.a.",
         "group:negapoji-bu",
@@ -3976,6 +4005,9 @@ object Group : TagList {
         "group:niche industry",
         "group:niche no sacchi",
         "group:niche onsei koubou",
+    )
+
+    override fun getTags3(): List<String> = listOf(
         "group:nichijou superumisu",
         "group:nico-ichi",
         "group:nicolion",
@@ -4005,9 +4037,6 @@ object Group : TagList {
         "group:nikomark",
         "group:nikomi omurice",
         "group:nikoniko company",
-    )
-
-    override fun getTags3(): List<String> = listOf(
         "group:niku ringo",
         "group:nikubenki seisakusho",
         "group:nikudan",
@@ -4117,6 +4146,7 @@ object Group : TagList {
         "group:nul neverland",
         "group:nullpp at",
         "group:numa no suisou",
+        "group:number sharp",
         "group:number2",
         "group:nununu teikoku",
         "group:nurserytale",
@@ -4136,6 +4166,7 @@ object Group : TagList {
         "group:nyangorodo",
         "group:nyanko batake",
         "group:nyanko house",
+        "group:nyoninka kenkyuujo",
         "group:nyoraho mimizuku",
         "group:nyuu bou nyuu",
         "group:nyuu koubou",
@@ -4203,6 +4234,7 @@ object Group : TagList {
         "group:okome rice don",
         "group:okomegokoro",
         "group:oku red",
+        "group:okubyou yagi",
         "group:okura teishoku",
         "group:omae pant hakanai",
         "group:omaera no ai de jisuu seigen koeta",
@@ -4280,6 +4312,7 @@ object Group : TagList {
         "group:otogidou",
         "group:otogiya",
         "group:otohime-dou",
+        "group:otoko no saimin fetiya-san",
         "group:otokogumo",
         "group:otokonoko club",
         "group:otokonoko soft",
@@ -4318,6 +4351,7 @@ object Group : TagList {
         "group:p.p",
         "group:p.p.d.",
         "group:p.s.",
+        "group:p.y.l...",
         "group:pa.da.wan",
         "group:pacapuca",
         "group:pachipachi soft",
@@ -4334,6 +4368,7 @@ object Group : TagList {
         "group:pan koubou",
         "group:pan to butterfly.",
         "group:panda 4gou",
+        "group:panda ekisu",
         "group:pandadanpa",
         "group:pandagaippiki.",
         "group:pandaniku",
@@ -4495,6 +4530,7 @@ object Group : TagList {
         "group:pokopii",
         "group:pomimiko",
         "group:pomme jus",
+        "group:pon pogler",
         "group:ponchees kari",
         "group:ponkotuna potunoya",
         "group:ponpon-black",
@@ -4802,6 +4838,7 @@ object Group : TagList {
         "group:s.s.t.works",
         "group:s40 koubou",
         "group:sa ku",
+        "group:saba et cetera",
         "group:sabaku no nezumi",
         "group:sabamintoya",
         "group:saboikku gundan",
@@ -5238,6 +5275,7 @@ object Group : TagList {
         "group:so",
         "group:soba to mayo",
         "group:soba udon",
+        "group:soboro kenkyuujo",
         "group:socha-ya",
         "group:sodaya",
         "group:sodenoka",
@@ -5367,6 +5405,7 @@ object Group : TagList {
         "group:studio kimigabuchi",
         "group:studio kyawn",
         "group:studio m nda pon",
+        "group:studio maulunch",
         "group:studio mcr",
         "group:studio miki shinsha",
         "group:studio mizuyokan",
@@ -5415,6 +5454,7 @@ object Group : TagList {
         "group:sugar house",
         "group:sugar milk syndrome",
         "group:sugarspot",
+        "group:sugomori.",
         "group:sugorokudou",
         "group:sui sui works",
         "group:sui-sui-laboratory",
@@ -5751,6 +5791,7 @@ object Group : TagList {
         "group:toriten software studio.",
         "group:toro plus drop",
         "group:toro toro resistance",
+        "group:toro-chin teishoku",
         "group:toro2 circus",
         "group:torochidan",
         "group:toruneko chaya",
@@ -5801,6 +5842,7 @@ object Group : TagList {
         "group:triple threat",
         "group:tristesse-azur",
         "group:trivial rays",
+        "group:trngs",
         "group:trodh",
         "group:troid-oh",
         "group:trotpony",
@@ -5833,6 +5875,7 @@ object Group : TagList {
         "group:tsurutasousankai",
         "group:tsurutsuru ippai",
         "group:tsutaya-katsuodou",
+        "group:tsuyu no torikago",
         "group:tubasa",
         "group:tuberose",
         "group:tuiteyukenuyo",
@@ -5896,6 +5939,7 @@ object Group : TagList {
         "group:ultrasexyheroines",
         "group:umanami shobou",
         "group:umanori kishidan",
+        "group:umasika kouen",
         "group:umaya",
         "group:ume-nyan-tei",
         "group:umekkodo",
@@ -5964,49 +6008,5 @@ object Group : TagList {
         "group:urayorozuya",
         "group:urekko",
         "group:uresen",
-        "group:uribatakebokujou",
-        "group:urondou",
-        "group:urusai kokuen",
-        "group:us",
-        "group:usa daioh",
-        "group:usa.k",
-        "group:usagi ame",
-        "group:usagi milk",
-        "group:usagi soft",
-        "group:usagi youjinbou",
-        "group:usagijiru",
-        "group:usagikoara",
-        "group:usaginoheya",
-        "group:usagitei",
-        "group:usako kf",
-        "group:usamimi syndrome",
-        "group:usamimi zukin",
-        "group:usausa",
-        "group:ushi ushido",
-        "group:ushidon-ya",
-        "group:uso seisakusho",
-        "group:usotsuki house",
-        "group:usotsukiya",
-        "group:utamaru press",
-        "group:utanone dou",
-        "group:utatanetaruto",
-        "group:utataneyashiki",
-        "group:utatte gou",
-        "group:uten plus",
-        "group:utinotyutai",
-        "group:utsukawaya",
-        "group:uwasa no ero radiohead",
-        "group:uzigaya",
-        "group:uzoumuzou",
-        "group:uzukikan",
-        "group:uzumeya honpo",
-        "group:uzusio",
-        "group:uzuuzu company",
-        "group:v. hercules",
-        "group:v112cr",
-        "group:vachicalist",
-        "group:vagina dentata",
-        "group:valiant",
-        "group:valkyria",
     )
 }
diff --git a/app/src/main/java/exh/eh/tags/Group2.kt b/app/src/main/java/exh/eh/tags/Group2.kt
index 92728c5d8..44040ee7a 100644
--- a/app/src/main/java/exh/eh/tags/Group2.kt
+++ b/app/src/main/java/exh/eh/tags/Group2.kt
@@ -2,6 +2,50 @@ package exh.eh.tags
 
 object Group2 : TagList {
     override fun getTags1(): List<String> = listOf(
+        "group:uribatakebokujou",
+        "group:urondou",
+        "group:urusai kokuen",
+        "group:us",
+        "group:usa daioh",
+        "group:usa.k",
+        "group:usagi ame",
+        "group:usagi milk",
+        "group:usagi soft",
+        "group:usagi youjinbou",
+        "group:usagijiru",
+        "group:usagikoara",
+        "group:usaginoheya",
+        "group:usagitei",
+        "group:usako kf",
+        "group:usamimi syndrome",
+        "group:usamimi zukin",
+        "group:usausa",
+        "group:ushi ushido",
+        "group:ushidon-ya",
+        "group:uso seisakusho",
+        "group:usotsuki house",
+        "group:usotsukiya",
+        "group:utamaru press",
+        "group:utanone dou",
+        "group:utatanetaruto",
+        "group:utataneyashiki",
+        "group:utatte gou",
+        "group:uten plus",
+        "group:utinotyutai",
+        "group:utsukawaya",
+        "group:uwasa no ero radiohead",
+        "group:uzigaya",
+        "group:uzoumuzou",
+        "group:uzukikan",
+        "group:uzumeya honpo",
+        "group:uzusio",
+        "group:uzuuzu company",
+        "group:v. hercules",
+        "group:v112cr",
+        "group:vachicalist",
+        "group:vagina dentata",
+        "group:valiant",
+        "group:valkyria",
         "group:valkyrieharlem",
         "group:vanilla fuumi shoujo",
         "group:vanilla star",
@@ -49,6 +93,7 @@ object Group2 : TagList {
         "group:watagashi maker",
         "group:watanabe tou",
         "group:wataru kuya",
+        "group:watashi ga ichiban kawaii",
         "group:water ducts",
         "group:waterfall",
         "group:waterspoon",
@@ -76,6 +121,7 @@ object Group2 : TagList {
         "group:windarteam",
         "group:winger in mind",
         "group:winghills",
+        "group:winglet torte",
         "group:wish",
         "group:wish kibou no tsubasa",
         "group:witchflame",
@@ -158,6 +204,7 @@ object Group2 : TagList {
         "group:yatuumi no kagami",
         "group:yawaraka okashiya",
         "group:yaya hinata-ya",
+        "group:yellow signal",
         "group:yes sir.",
         "group:yggdrasil",
         "group:yo-metdo",
@@ -334,6 +381,7 @@ object Group2 : TagList {
         "group:zouri no sato",
         "group:zozalist",
         "group:zugaikotsu marudashi",
+        "group:zundoko sperm bank",
         "group:zvizva-dan",
         "group:zydan",
         "group:zyulokuya",
diff --git a/app/src/main/java/exh/eh/tags/Male.kt b/app/src/main/java/exh/eh/tags/Male.kt
index ce3a1ff5e..cf00c3f2f 100644
--- a/app/src/main/java/exh/eh/tags/Male.kt
+++ b/app/src/main/java/exh/eh/tags/Male.kt
@@ -42,6 +42,7 @@ object Male : TagList {
         "male:bear",
         "male:bear boy",
         "male:beauty mark",
+        "male:bee boy",
         "male:bestiality",
         "male:big areolae",
         "male:big ass",
@@ -53,7 +54,6 @@ object Male : TagList {
         "male:big penis",
         "male:bike shorts",
         "male:bikini",
-        "male:birth",
         "male:bisexual",
         "male:blackmail",
         "male:blind",
@@ -99,6 +99,7 @@ object Male : TagList {
         "male:clamp",
         "male:clit insertion",
         "male:clit stimulation",
+        "male:cloaca insertion",
         "male:clone",
         "male:closed eyes",
         "male:clothed female nude male",
@@ -140,6 +141,7 @@ object Male : TagList {
         "male:dicknipples",
         "male:dilf",
         "male:dinosaur",
+        "male:dismantling",
         "male:dog",
         "male:dog boy",
         "male:doll joints",
@@ -179,6 +181,8 @@ object Male : TagList {
         "male:fish",
         "male:fishnets",
         "male:fisting",
+        "male:focus anal",
+        "male:focus blowjob",
         "male:focus paizuri",
         "male:food on body",
         "male:foot insertion",
@@ -190,6 +194,7 @@ object Male : TagList {
         "male:fox boy",
         "male:freckles",
         "male:frog",
+        "male:frog boy",
         "male:frottage",
         "male:fundoshi",
         "male:furry",
@@ -222,12 +227,15 @@ object Male : TagList {
         "male:hairjob",
         "male:hairy",
         "male:hairy armpits",
+        "male:handicapped",
         "male:handjob",
         "male:hanging",
         "male:harem",
+        "male:harness",
         "male:harpy",
         "male:headphones",
         "male:heterochromia",
+        "male:hidden sex",
         "male:hijab",
         "male:hood",
         "male:horns",
@@ -236,6 +244,7 @@ object Male : TagList {
         "male:horse cock",
         "male:hotpants",
         "male:huge penis",
+        "male:human cattle",
         "male:human on furry",
         "male:humiliation",
         "male:hyena boy",
@@ -245,6 +254,7 @@ object Male : TagList {
         "male:inflation",
         "male:insect",
         "male:insect boy",
+        "male:inseki",
         "male:internal urination",
         "male:inverted nipples",
         "male:invisible",
@@ -315,6 +325,7 @@ object Male : TagList {
         "male:multiple straddling",
         "male:muscle",
         "male:muscle growth",
+        "male:mute",
         "male:nakadashi",
         "male:navel fuck",
         "male:nazi",
@@ -331,6 +342,7 @@ object Male : TagList {
         "male:octopus",
         "male:oil",
         "male:old man",
+        "male:omorashi",
         "male:onahole",
         "male:oni",
         "male:orc",
@@ -353,6 +365,7 @@ object Male : TagList {
         "male:petplay",
         "male:petrification",
         "male:phimosis",
+        "male:phone sex",
         "male:piercing",
         "male:pig",
         "male:pig man",
@@ -486,18 +499,21 @@ object Male : TagList {
         "male:urethra insertion",
         "male:urination",
         "male:vacbed",
+        "male:vaginal birth",
         "male:vampire",
         "male:very long hair",
         "male:virginity",
         "male:vomit",
         "male:vore",
         "male:voyeurism",
+        "male:vtuber",
         "male:waiter",
         "male:waitress",
         "male:weight gain",
         "male:wet clothes",
         "male:whale",
         "male:whip",
+        "male:widower",
         "male:wings",
         "male:witch",
         "male:wolf",
diff --git a/app/src/main/java/exh/eh/tags/Mixed.kt b/app/src/main/java/exh/eh/tags/Mixed.kt
index 01911e33d..070904f7a 100644
--- a/app/src/main/java/exh/eh/tags/Mixed.kt
+++ b/app/src/main/java/exh/eh/tags/Mixed.kt
@@ -8,6 +8,7 @@ object Mixed : TagList {
         "mixed:frottage",
         "mixed:group",
         "mixed:incest",
+        "mixed:inseki",
         "mixed:mmf threesome",
         "mixed:mmt threesome",
         "mixed:mtf threesome",
diff --git a/app/src/main/java/exh/eh/tags/Other.kt b/app/src/main/java/exh/eh/tags/Other.kt
index a4b188d8a..7eb97306f 100644
--- a/app/src/main/java/exh/eh/tags/Other.kt
+++ b/app/src/main/java/exh/eh/tags/Other.kt
@@ -44,6 +44,7 @@ object Other : TagList {
         "other:scanmark",
         "other:screenshots",
         "other:sketch lines",
+        "other:soushuuhen",
         "other:stereoscopic",
         "other:story arc",
         "other:tankoubon",
diff --git a/app/src/main/java/exh/eh/tags/Parody.kt b/app/src/main/java/exh/eh/tags/Parody.kt
index 6eb224dfd..1d41687ed 100644
--- a/app/src/main/java/exh/eh/tags/Parody.kt
+++ b/app/src/main/java/exh/eh/tags/Parody.kt
@@ -13,6 +13,8 @@ object Parody : TagList {
         "parody:11eyes",
         "parody:12-sai.",
         "parody:13 reasons why",
+        "parody:19 tian",
+        "parody:2.5-jigen no yuuwaku",
         "parody:21 emon",
         "parody:22 slash 7",
         "parody:2x2 shinobuden",
@@ -28,7 +30,6 @@ object Parody : TagList {
         "parody:a dog of flanders",
         "parody:a little snow fairy sugar",
         "parody:a nightmare on elm street",
-        "parody:a town where you live",
         "parody:a vampyre story",
         "parody:a.d.police",
         "parody:a.i. ga tomaranai",
@@ -39,6 +40,7 @@ object Parody : TagList {
         "parody:ace attorney",
         "parody:adachi to shimamura",
         "parody:addie no okurimono",
+        "parody:advance of zeta",
         "parody:adventure time",
         "parody:adventures of the gummi bears",
         "parody:aflame inferno",
@@ -111,6 +113,7 @@ object Parody : TagList {
         "parody:ano hi mita hana no namae wo bokutachi wa mada shiranai",
         "parody:ano natsu de matteru",
         "parody:another lady innocent",
+        "parody:anothereidos of dragon vein r",
         "parody:anpanman",
         "parody:ansatsu kyoushitsu",
         "parody:anyamaru tantei kiruminzoo",
@@ -321,6 +324,7 @@ object Parody : TagList {
         "parody:bubblegum crisis",
         "parody:bubu to bubulina",
         "parody:bubuki buranki",
+        "parody:bucchigire",
         "parody:bucky ohare",
         "parody:buffy the vampire slayer",
         "parody:bully",
@@ -822,6 +826,7 @@ object Parody : TagList {
         "parody:grancrest senki",
         "parody:grander musashi",
         "parody:grandia",
+        "parody:grandmaster of demonic cultivation",
         "parody:grappler baki",
         "parody:gravity rush",
         "parody:great teacher onizuka",
@@ -1024,6 +1029,7 @@ object Parody : TagList {
         "parody:isekai maou to shoukan shoujo no dorei majutsu",
         "parody:isekai meikyuu de harem o",
         "parody:isekai no seikishi monogatari",
+        "parody:isekai ojisan",
         "parody:isekai shokudou",
         "parody:isekai wa smartphone to tomo ni.",
         "parody:issho ni training",
@@ -1098,6 +1104,7 @@ object Parody : TagList {
         "parody:kaiketsu zorro",
         "parody:kaitou tenshi twin angel",
         "parody:kaizoku sentai gokaiger",
+        "parody:kakkou no iinazuke",
         "parody:kaku-san-sei million arthur",
         "parody:kakugo no susume",
         "parody:kakyuusei",
@@ -1167,6 +1174,7 @@ object Parody : TagList {
         "parody:kimi ga shine",
         "parody:kimi ga yobu megiddo no oka de",
         "parody:kimi ni todoke",
+        "parody:kimi no iru machi",
         "parody:kimi no koto ga daidaidaidaidaisuki na 100-nin no kanojo",
         "parody:kimi no na wa.",
         "parody:kimi to boku no saigo no senjou aruiwa sekai ga hajimaru seisen",
@@ -1205,6 +1213,7 @@ object Parody : TagList {
         "parody:kokoro ga sakebitagatterunda.",
         "parody:kokoro library",
         "parody:komi-san wa komyushou desu.",
+        "parody:konjiki no gash",
         "parody:konjiki no word master",
         "parody:kono aozora ni yakusoku o",
         "parody:kono healer mendokusai",
@@ -1417,6 +1426,7 @@ object Parody : TagList {
         "parody:mass effect",
         "parody:master of eternity",
         "parody:matantei loki ragnarok",
+        "parody:matenshi material",
         "parody:matou kitan zankan",
         "parody:mawaru penguindrum",
         "parody:mayo chiki",
@@ -1450,6 +1460,7 @@ object Parody : TagList {
         "parody:mezzo forte",
         "parody:midori no hibi",
         "parody:midori no umi",
+        "parody:mighty magiswords",
         "parody:mighty no. 9",
         "parody:mighty orbots",
         "parody:mikakunin de shinkoukei",
@@ -1476,6 +1487,7 @@ object Parody : TagList {
         "parody:mobile suit gundam",
         "parody:mobile suit gundam lost war chronicles",
         "parody:mobile suit gundam the 08th ms team",
+        "parody:mobile suit gundam the witch from mercury",
         "parody:moekan",
         "parody:moetan",
         "parody:momo kyun sword",
@@ -1598,6 +1610,7 @@ object Parody : TagList {
         "parody:oboro muramasa",
         "parody:occult academy",
         "parody:occultic nine",
+        "parody:oceans 8",
         "parody:ochamegami monogatari korokoro pollon",
         "parody:ochikobore fruit tart",
         "parody:ochitekita ryuuou to horobiyuku majo no kuni",
@@ -1837,6 +1850,7 @@ object Parody : TagList {
         "parody:saijaku muhai no bahamut",
         "parody:saijou no meii",
         "parody:saikano",
+        "parody:saikin yatotta maid ga ayashii",
         "parody:sailor moon",
         "parody:saint luminous jogakuin",
         "parody:saint seiya",
@@ -1988,6 +2002,9 @@ object Parody : TagList {
         "parody:sin city",
         "parody:sing yesterday for me",
         "parody:siren",
+    )
+
+    override fun getTags2(): List<String> = listOf(
         "parody:sisters natsu no saigo no hi",
         "parody:sket dance",
         "parody:skies of arcadia",
@@ -2002,9 +2019,6 @@ object Parody : TagList {
         "parody:snow white and the seven dwarfs",
         "parody:sokihei m.d. geist",
         "parody:solatorobo",
-    )
-
-    override fun getTags2(): List<String> = listOf(
         "parody:soltyrei",
         "parody:sonic soldier borgman",
         "parody:sonic the hedgehog",
@@ -2317,6 +2331,7 @@ object Parody : TagList {
         "parody:tom clancys ghost recon",
         "parody:tom clancys rainbow six",
         "parody:tomb raider",
+        "parody:tomica kizuna gattai earth granner",
         "parody:tomodachi no imouto ga ore ni dake uzai",
         "parody:tonagura",
         "parody:tonari no kaibutsu-kun",
@@ -2557,7 +2572,6 @@ object Parody : TagList {
         "parody:z slash x",
         "parody:zankyou no terror",
         "parody:zannen onna kanbu black general-san",
-        "parody:zatch bell",
         "parody:zegapain",
         "parody:zeiram",
         "parody:zenkoku seifuku bishoujo grand prix",