diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_de.json b/PKHeX.Core/Resources/localize/encounter/encounter_de.json
index 22242f27e..55d69c405 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_de.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_de.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "Neues Spiel: 0x{0}, Frame: {1}",
     "FrameInitial": "Initial: 0x{0}, Frame: {1}",
     "SuffixDays": " (tage: {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_en.json b/PKHeX.Core/Resources/localize/encounter/encounter_en.json
index 4390a110d..94cf5f6b5 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_en.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_en.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "New Game: 0x{0}, Frame: {1}",
     "FrameInitial": "Initial: 0x{0}, Frame: {1}",
     "SuffixDays": " (days: {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_es-419.json b/PKHeX.Core/Resources/localize/encounter/encounter_es-419.json
index 3baf975e7..bd2a549dd 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_es-419.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_es-419.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "Nuevo juego: 0x{0}, Fotograma: {1}",
     "FrameInitial": "Inicial: 0x{0}, Fotograma: {1}",
     "SuffixDays": " (días: {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_es.json b/PKHeX.Core/Resources/localize/encounter/encounter_es.json
index 3baf975e7..bd2a549dd 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_es.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_es.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "Nuevo juego: 0x{0}, Fotograma: {1}",
     "FrameInitial": "Inicial: 0x{0}, Fotograma: {1}",
     "SuffixDays": " (días: {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_fr.json b/PKHeX.Core/Resources/localize/encounter/encounter_fr.json
index 4b7d6c3bb..4e08a9c35 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_fr.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_fr.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "Nouvelle partie : 0x{0}, Image : {1}",
     "FrameInitial": "Initial : 0x{0}, Image : {1}",
     "SuffixDays": " (jours : {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_it.json b/PKHeX.Core/Resources/localize/encounter/encounter_it.json
index 663999f60..994d32ea0 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_it.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_it.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "Nuova partita: 0x{0}, Frame: {1}",
     "FrameInitial": "Iniziale: 0x{0}, Frame: {1}",
     "SuffixDays": " (giorni: {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_ja.json b/PKHeX.Core/Resources/localize/encounter/encounter_ja.json
index d747be568..c8ad408c9 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_ja.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_ja.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "新規ゲーム: 0x{0}, フレーム: {1}",
     "FrameInitial": "初期値: 0x{0}, フレーム: {1}",
     "SuffixDays": " (日数: {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_ko.json b/PKHeX.Core/Resources/localize/encounter/encounter_ko.json
index c3b613e17..8aab8f424 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_ko.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_ko.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "새 게임: 0x{0}, 프레임: {1}",
     "FrameInitial": "초기값: 0x{0}, 프레임: {1}",
     "SuffixDays": " (일: {0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_zh-hans.json b/PKHeX.Core/Resources/localize/encounter/encounter_zh-hans.json
index e9e5a7752..ada470a75 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_zh-hans.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_zh-hans.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "新游戏：0x{0}，帧：{1}",
     "FrameInitial": "初始：0x{0}，帧：{1}",
     "SuffixDays": " (天数：{0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/encounter/encounter_zh-hant.json b/PKHeX.Core/Resources/localize/encounter/encounter_zh-hant.json
index 74d3b12b0..04b0b2386 100644
--- a/PKHeX.Core/Resources/localize/encounter/encounter_zh-hant.json
+++ b/PKHeX.Core/Resources/localize/encounter/encounter_zh-hant.json
@@ -12,4 +12,4 @@
     "FrameNewGame": "新遊戲：0x{0}，幀：{1}",
     "FrameInitial": "初始：0x{0}，幀：{1}",
     "SuffixDays": " (天數：{0})"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_de.json b/PKHeX.Core/Resources/localize/legality/legality_de.json
index a8f8a053b..39972175f 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_de.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_de.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_en.json b/PKHeX.Core/Resources/localize/legality/legality_en.json
index a6c1d324c..d890757fb 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_en.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_en.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_es-419.json b/PKHeX.Core/Resources/localize/legality/legality_es-419.json
index 2ffc1f4a6..a3d82f71e 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_es-419.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_es-419.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_es.json b/PKHeX.Core/Resources/localize/legality/legality_es.json
index 3ecd5f131..9f92a41a8 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_es.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_es.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_fr.json b/PKHeX.Core/Resources/localize/legality/legality_fr.json
index 713b4f1ad..364245c03 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_fr.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_fr.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "L'objet {0} n'a pas été obtenu dans l'inventaire du joueur.",
     "BulkHeldItemInventoryUnassigned_0": "L'objet {0} n'est pas marqué comme ayant été assigné dans l'inventaire du joueur.",
     "BulkFusionSourceInvalid": "L'espèce retirée de fusion stockée dans la sauvegarde ne correspond pas à la forme de fusion stockée attendue."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_it.json b/PKHeX.Core/Resources/localize/legality/legality_it.json
index d2152a95d..7873ac1f3 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_it.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_it.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_ja.json b/PKHeX.Core/Resources/localize/legality/legality_ja.json
index 6a7a85ced..3a51fa8f8 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_ja.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_ja.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_ko.json b/PKHeX.Core/Resources/localize/legality/legality_ko.json
index 279f624ac..2f26ff87a 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_ko.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_ko.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json b/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json
index 67097ca59..df4b1e068 100644
--- a/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json
+++ b/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json
@@ -374,4 +374,4 @@
     "BulkHeldItemInventoryNotAcquired_0": "{0} has not been acquired in player inventory.",
     "BulkHeldItemInventoryUnassigned_0": "{0} is not marked as assigned in player inventory.",
     "BulkFusionSourceInvalid": "The subsumed Species-Form stored in the save file does not match the expected Species-Form of the fused slot."
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_de.json b/PKHeX.Core/Resources/localize/movesource/movesource_de.json
index 724d1a1b3..93d7e4c80 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_de.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_de.json
@@ -18,4 +18,4 @@
     "EggInvalid": "Unerwartete Ei-Attacke.",
     "EggLevelUp": "Vererbte Attacke durch Level-Aufstieg erlernt.",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_en.json b/PKHeX.Core/Resources/localize/movesource/movesource_en.json
index ee66b57fc..000b7c93b 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_en.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_en.json
@@ -18,4 +18,4 @@
     "EggInvalid": "Not an expected Egg move.",
     "EggLevelUp": "Inherited move learned by Level-up.",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_es-419.json b/PKHeX.Core/Resources/localize/movesource/movesource_es-419.json
index 9bd46e85b..cf08d4a8e 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_es-419.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_es-419.json
@@ -18,4 +18,4 @@
     "EggInvalid": "Movimiento Huevo no esperado.",
     "EggLevelUp": "Movimiento heredado aprendido por subida de nivel.",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_es.json b/PKHeX.Core/Resources/localize/movesource/movesource_es.json
index 9bd46e85b..cf08d4a8e 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_es.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_es.json
@@ -18,4 +18,4 @@
     "EggInvalid": "Movimiento Huevo no esperado.",
     "EggLevelUp": "Movimiento heredado aprendido por subida de nivel.",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_fr.json b/PKHeX.Core/Resources/localize/movesource/movesource_fr.json
index 8e5366430..9f28a67d6 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_fr.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_fr.json
@@ -18,4 +18,4 @@
     "EggInvalid": "Capacité Œuf non attendue.",
     "EggLevelUp": "Capacité héritée apprise par montée de niveau.",
     "LevelUpSuffix": " @ niv {0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_it.json b/PKHeX.Core/Resources/localize/movesource/movesource_it.json
index a4f0ccb08..78ed22277 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_it.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_it.json
@@ -18,4 +18,4 @@
     "EggInvalid": "Mossa Uovo non prevista.",
     "EggLevelUp": "Mossa ereditata appresa per aumento di livello.",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_ja.json b/PKHeX.Core/Resources/localize/movesource/movesource_ja.json
index f13ce81fd..4b9797a62 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_ja.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_ja.json
@@ -18,4 +18,4 @@
     "EggInvalid": "期待されないタマゴ技。",
     "EggLevelUp": "遺伝レベルアップ技。",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_ko.json b/PKHeX.Core/Resources/localize/movesource/movesource_ko.json
index e3f968d85..5d09d8c6d 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_ko.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_ko.json
@@ -18,4 +18,4 @@
     "EggInvalid": "예상되지 않은 알 기술.",
     "EggLevelUp": "유전된 레벨업 기술.",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_zh-hans.json b/PKHeX.Core/Resources/localize/movesource/movesource_zh-hans.json
index 19db03f99..fee1a6e6f 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_zh-hans.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_zh-hans.json
@@ -18,4 +18,4 @@
     "EggInvalid": "非预期的蛋招式。",
     "EggLevelUp": "遗传升级学会的招式。",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Resources/localize/movesource/movesource_zh-hant.json b/PKHeX.Core/Resources/localize/movesource/movesource_zh-hant.json
index 13fccabbc..a6524317a 100644
--- a/PKHeX.Core/Resources/localize/movesource/movesource_zh-hant.json
+++ b/PKHeX.Core/Resources/localize/movesource/movesource_zh-hant.json
@@ -18,4 +18,4 @@
     "EggInvalid": "非預期的蛋招式。",
     "EggLevelUp": "遺傳升級學會的招式。",
     "LevelUpSuffix": " @ lv{0}"
-}
\ No newline at end of file
+}
diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs
index 8beaa70ed..609e56d71 100644
--- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs	
+++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs	
@@ -1636,8 +1636,7 @@ private void B_SearchBox_Click(object sender, EventArgs e)
     private EntitySearchSetup CreateSearcher(SaveFile sav, IPKMView edit)
     {
         BoxSearchClear();
-        var result = new EntitySearchSetup();
-        result.Initialize(sav, edit);
+        var result = new EntitySearchSetup(edit, sav);
 
         result.ResetRequested += UpdateSearch;
         result.SearchRequested += UpdateSearch;
diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt
index 053cb8068..7195a8042 100644
--- a/PKHeX.WinForms/Resources/text/lang_de.txt
+++ b/PKHeX.WinForms/Resources/text/lang_de.txt
@@ -1,6 +1,7 @@
 About=Über
 BatchEditor=Batch Editor
 BoxExporter=Box Export
+EntitySearchSetup=Search
 ErrorWindow=Fehler
 KChart=Tabelle
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=Andere 3
 BattlePassType.Rental=Leih
 BoxExporter.B_Export=Export
 BoxExporter.L_Namer=Namer:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=Abbrechen
 ErrorWindow.B_Continue=Fortfahren
 ErrorWindow.B_CopyToClipboard=In Zwischenablage kopieren
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Languages
 SAV_Pokedex9a.GB_Seen=Seen
 SAV_Pokedex9a.L_Caught=Caught:
 SAV_Pokedex9a.L_DisplayForm=Form:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=goto:
 SAV_Pokedex9a.L_Seen=Seen:
 SAV_Pokedex9a.L_SeenShiny=Seen (Shiny):
diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt
index 2591cafd1..7b473914d 100644
--- a/PKHeX.WinForms/Resources/text/lang_en.txt
+++ b/PKHeX.WinForms/Resources/text/lang_en.txt
@@ -1,6 +1,7 @@
 About=About
 BatchEditor=Batch Editor
 BoxExporter=Box Export
+EntitySearchSetup=Search
 ErrorWindow=Error
 KChart=KChart
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=Other 3
 BattlePassType.Rental=Rental
 BoxExporter.B_Export=Export
 BoxExporter.L_Namer=Namer:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=Abort
 ErrorWindow.B_Continue=Continue
 ErrorWindow.B_CopyToClipboard=Copy to Clipboard
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Languages
 SAV_Pokedex9a.GB_Seen=Seen
 SAV_Pokedex9a.L_Caught=Caught:
 SAV_Pokedex9a.L_DisplayForm=Form:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=goto:
 SAV_Pokedex9a.L_Seen=Seen:
 SAV_Pokedex9a.L_SeenShiny=Seen (Shiny):
diff --git a/PKHeX.WinForms/Resources/text/lang_es-419.txt b/PKHeX.WinForms/Resources/text/lang_es-419.txt
index efc7ddae8..8d299dcee 100644
--- a/PKHeX.WinForms/Resources/text/lang_es-419.txt
+++ b/PKHeX.WinForms/Resources/text/lang_es-419.txt
@@ -1,6 +1,7 @@
 About=Acerca de
 BatchEditor=Editor por Lotes
 BoxExporter=Exportar caja
+EntitySearchSetup=Search
 ErrorWindow=Error
 KChart=KChart
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=Otros 3
 BattlePassType.Rental=Préstamo
 BoxExporter.B_Export=Exportar
 BoxExporter.L_Namer=Nombre:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=Abortar
 ErrorWindow.B_Continue=Continuar
 ErrorWindow.B_CopyToClipboard=Copiar al portapapeles
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Languages
 SAV_Pokedex9a.GB_Seen=Seen
 SAV_Pokedex9a.L_Caught=Caught:
 SAV_Pokedex9a.L_DisplayForm=Form:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=goto:
 SAV_Pokedex9a.L_Seen=Seen:
 SAV_Pokedex9a.L_SeenShiny=Seen (Shiny):
diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt
index 56fbc7331..074fa405d 100644
--- a/PKHeX.WinForms/Resources/text/lang_es.txt
+++ b/PKHeX.WinForms/Resources/text/lang_es.txt
@@ -1,6 +1,7 @@
 About=Acerca de
 BatchEditor=Editor por Lotes
 BoxExporter=Exportar caja
+EntitySearchSetup=Search
 ErrorWindow=Error
 KChart=KChart
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=Otros 3
 BattlePassType.Rental=Préstamo
 BoxExporter.B_Export=Exportar
 BoxExporter.L_Namer=Nombre:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=Abortar
 ErrorWindow.B_Continue=Continuar
 ErrorWindow.B_CopyToClipboard=Copiar al portapapeles
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Idiomas
 SAV_Pokedex9a.GB_Seen=Visto
 SAV_Pokedex9a.L_Caught=Capturado:
 SAV_Pokedex9a.L_DisplayForm=Forma:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=goto:
 SAV_Pokedex9a.L_Seen=Visto:
 SAV_Pokedex9a.L_SeenShiny=Visto (Variocolor):
diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt
index e9f4c8c91..12c448876 100644
--- a/PKHeX.WinForms/Resources/text/lang_fr.txt
+++ b/PKHeX.WinForms/Resources/text/lang_fr.txt
@@ -1,6 +1,7 @@
 About=À propos
 BatchEditor=Éditeur en vrac
 BoxExporter=Export de boîtes
+EntitySearchSetup=Search
 ErrorWindow=Erreur
 KChart=KChart
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=Autre 3
 BattlePassType.Rental=Location
 BoxExporter.B_Export=Exporter
 BoxExporter.L_Namer=Nommer :
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=Abandonner
 ErrorWindow.B_Continue=Continuer
 ErrorWindow.B_CopyToClipboard=Copier dans le presse-papiers
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Langues
 SAV_Pokedex9a.GB_Seen=Vu
 SAV_Pokedex9a.L_Caught=Capturé :
 SAV_Pokedex9a.L_DisplayForm=Forme :
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=Aller à :
 SAV_Pokedex9a.L_Seen=Vu :
 SAV_Pokedex9a.L_SeenShiny=Vu (chromatique) :
diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt
index ee669ec0d..a46753132 100644
--- a/PKHeX.WinForms/Resources/text/lang_it.txt
+++ b/PKHeX.WinForms/Resources/text/lang_it.txt
@@ -1,6 +1,7 @@
 About=Info
 BatchEditor=Editor Batch
 BoxExporter=Box Export
+EntitySearchSetup=Search
 ErrorWindow=Errore
 KChart=KChart
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=Varie 3
 BattlePassType.Rental=Noleggio
 BoxExporter.B_Export=Export
 BoxExporter.L_Namer=Namer:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=Annulla
 ErrorWindow.B_Continue=Continua
 ErrorWindow.B_CopyToClipboard=Copiato negli appunti
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Languages
 SAV_Pokedex9a.GB_Seen=Seen
 SAV_Pokedex9a.L_Caught=Caught:
 SAV_Pokedex9a.L_DisplayForm=Form:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=goto:
 SAV_Pokedex9a.L_Seen=Seen:
 SAV_Pokedex9a.L_SeenShiny=Seen (Shiny):
diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt
index e25844dc0..0dc3f668e 100644
--- a/PKHeX.WinForms/Resources/text/lang_ja.txt
+++ b/PKHeX.WinForms/Resources/text/lang_ja.txt
@@ -1,6 +1,7 @@
 About=About
 BatchEditor=バッチエディタ
 BoxExporter=ボックスエクスポート
+EntitySearchSetup=Search
 ErrorWindow=エラー
 KChart=KChart
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=その他3
 BattlePassType.Rental=レンタル
 BoxExporter.B_Export=エクスポート
 BoxExporter.L_Namer=Namer:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=キャンセル
 ErrorWindow.B_Continue=続ける
 ErrorWindow.B_CopyToClipboard=クリップボードにコピー
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=言語
 SAV_Pokedex9a.GB_Seen=見つけた
 SAV_Pokedex9a.L_Caught=捕まえた:
 SAV_Pokedex9a.L_DisplayForm=フォルム:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=逃げられた:
 SAV_Pokedex9a.L_Seen=みつけた:
 SAV_Pokedex9a.L_SeenShiny=みつけた(色違い):
diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt
index 2ba129a62..b262717af 100644
--- a/PKHeX.WinForms/Resources/text/lang_ko.txt
+++ b/PKHeX.WinForms/Resources/text/lang_ko.txt
@@ -1,6 +1,7 @@
 About=정보
 BatchEditor=일괄 편집 도구
 BoxExporter=박스 내보내기
+EntitySearchSetup=Search
 ErrorWindow=오류
 KChart=KChart
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=Other 3
 BattlePassType.Rental=Rental
 BoxExporter.B_Export=Export
 BoxExporter.L_Namer=Namer:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=중단
 ErrorWindow.B_Continue=계속
 ErrorWindow.B_CopyToClipboard=클립보드에 복사
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Languages
 SAV_Pokedex9a.GB_Seen=Seen
 SAV_Pokedex9a.L_Caught=Caught:
 SAV_Pokedex9a.L_DisplayForm=Form:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=goto:
 SAV_Pokedex9a.L_Seen=Seen:
 SAV_Pokedex9a.L_SeenShiny=Seen (Shiny):
diff --git a/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt b/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt
index 0e6a30e8d..b09f37a02 100644
--- a/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt
+++ b/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt
@@ -1,6 +1,7 @@
 About=关于
 BatchEditor=批量编辑器
 BoxExporter=导出箱子
+EntitySearchSetup=检索
 ErrorWindow=错误
 KChart=信息列表
 Main=PKHeX
@@ -121,14 +122,13 @@ BattlePassType.Other3=其他3
 BattlePassType.Rental=租借
 BoxExporter.B_Export=导出
 BoxExporter.L_Namer=姓名:
-EntitySearchSetup=检索
-EntitySearchSetup.CHK_IsEgg=蛋
-EntitySearchSetup.CHK_Shiny=异色
 EntitySearchSetup.B_Add=添加
 EntitySearchSetup.B_Next=下一个
 EntitySearchSetup.B_Previous=上一个
 EntitySearchSetup.B_Reset=重置筛选
 EntitySearchSetup.B_Search=检索!
+EntitySearchSetup.CHK_IsEgg=蛋
+EntitySearchSetup.CHK_Shiny=异色
 EntitySearchSetup.L_ESV=异色值:
 EntitySearchSetup.L_EVTraining=努力值:
 EntitySearchSetup.L_Format=格式:
@@ -148,8 +148,6 @@ EntitySearchSetup.Label_Nickname=昵称:
 EntitySearchSetup.Label_Species=种类:
 EntitySearchSetup.Tab_Advanced=高级
 EntitySearchSetup.Tab_General=一般
-EntitySearchSetup.TC_SearchSettings=设置
-EntitySearchSetup.UC_EntitySearch=检索
 ErrorWindow.B_Abort=终止
 ErrorWindow.B_Continue=继续
 ErrorWindow.B_CopyToClipboard=复制到剪切板
@@ -1788,7 +1786,7 @@ SAV_Pokedex9a.GB_Language=语言
 SAV_Pokedex9a.GB_Seen=已见
 SAV_Pokedex9a.L_Caught=已捕获:
 SAV_Pokedex9a.L_DisplayForm=形态:
-SAV_Pokedex9a.L_DisplayGender=性别:
+SAV_Pokedex9a.L_DisplayGendered=性别:
 SAV_Pokedex9a.L_goto=跳转到:
 SAV_Pokedex9a.L_Seen=已见:
 SAV_Pokedex9a.L_SeenShiny=已见(异色):
diff --git a/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt b/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt
index da3a6ff33..13b0dee4c 100644
--- a/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt
+++ b/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt
@@ -1,6 +1,7 @@
 About=關於
 BatchEditor=批量編輯器
 BoxExporter=導出箱子
+EntitySearchSetup=Search
 ErrorWindow=錯誤
 KChart=信息清單
 Main=PKHeX
@@ -121,6 +122,32 @@ BattlePassType.Other3=其他3
 BattlePassType.Rental=租借
 BoxExporter.B_Export=導出
 BoxExporter.L_Namer=姓名:
+EntitySearchSetup.B_Add=Add
+EntitySearchSetup.B_Next=Next
+EntitySearchSetup.B_Previous=Previous
+EntitySearchSetup.B_Reset=Reset Filters
+EntitySearchSetup.B_Search=Search!
+EntitySearchSetup.CHK_IsEgg=Egg
+EntitySearchSetup.CHK_Shiny=Shiny
+EntitySearchSetup.L_ESV=ESV:
+EntitySearchSetup.L_EVTraining=EV Training:
+EntitySearchSetup.L_Format=Format:
+EntitySearchSetup.L_Generation=Generation:
+EntitySearchSetup.L_Move1=Move 1:
+EntitySearchSetup.L_Move2=Move 2:
+EntitySearchSetup.L_Move3=Move 3:
+EntitySearchSetup.L_Move4=Move 4:
+EntitySearchSetup.L_Potential=IV Potential:
+EntitySearchSetup.L_Version=OT Version:
+EntitySearchSetup.Label_Ability=Ability:
+EntitySearchSetup.Label_CurLevel=Level:
+EntitySearchSetup.Label_HeldItem=Held Item:
+EntitySearchSetup.Label_HiddenPowerPrefix=Hidden Power:
+EntitySearchSetup.Label_Nature=Nature:
+EntitySearchSetup.Label_Nickname=Nickname:
+EntitySearchSetup.Label_Species=Species:
+EntitySearchSetup.Tab_Advanced=Advanced
+EntitySearchSetup.Tab_General=General
 ErrorWindow.B_Abort=終止
 ErrorWindow.B_Continue=繼續
 ErrorWindow.B_CopyToClipboard=複製到剪切板
@@ -1759,6 +1786,7 @@ SAV_Pokedex9a.GB_Language=Languages
 SAV_Pokedex9a.GB_Seen=Seen
 SAV_Pokedex9a.L_Caught=Caught:
 SAV_Pokedex9a.L_DisplayForm=Form:
+SAV_Pokedex9a.L_DisplayGendered=Gender:
 SAV_Pokedex9a.L_goto=goto:
 SAV_Pokedex9a.L_Seen=Seen:
 SAV_Pokedex9a.L_SeenShiny=Seen (Shiny):
diff --git a/PKHeX.WinForms/Subforms/EntitySearchSetup.cs b/PKHeX.WinForms/Subforms/EntitySearchSetup.cs
index f074ae380..1e8bc150f 100644
--- a/PKHeX.WinForms/Subforms/EntitySearchSetup.cs
+++ b/PKHeX.WinForms/Subforms/EntitySearchSetup.cs
@@ -9,10 +9,17 @@ namespace PKHeX.WinForms;
 public partial class EntitySearchSetup : Form
 {
     private EntityInstructionBuilder? UC_Builder;
-    private SaveFile? CurrentSave;
+    private SaveFile CurrentSave;
     public Func<PKM, bool>? SearchFilter { get; private set; }
 
-    public EntitySearchSetup() => InitializeComponent();
+    public EntitySearchSetup(IPKMView edit, SaveFile sav)
+    {
+        CurrentSave = sav;
+        InitializeComponent();
+        Initialize(sav);
+        EnsureBuilder(edit);
+        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
+    }
 
     /// <summary>
     /// Occurs when the Search action is requested.
@@ -38,17 +45,13 @@ public partial class EntitySearchSetup : Form
     /// Initializes the search setup controls using the provided save file.
     /// </summary>
     /// <param name="sav">Save file used to configure search settings.</param>
-    /// <param name="edit">Editor to provide the current PKM.</param>
-    public void Initialize(SaveFile sav, IPKMView edit)
+    private void Initialize(SaveFile sav)
     {
-        ArgumentNullException.ThrowIfNull(sav);
-
+        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
         UC_EntitySearch.PopulateComboBoxes(GameInfo.FilteredSources);
         UC_EntitySearch.SetFormatAnyText(MsgAny);
         UC_EntitySearch.InitializeSelections(sav, showContext: false);
         CurrentSave = sav;
-        EnsureBuilder(edit);
-        WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
     }
 
     protected override void OnShown(EventArgs e)
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Pokedex9a.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Pokedex9a.Designer.cs
index 1db15f560..4355f7c83 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Pokedex9a.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Pokedex9a.Designer.cs	
@@ -48,7 +48,7 @@ private void InitializeComponent()
             CB_DisplayForm = new System.Windows.Forms.ComboBox();
             GB_Displayed = new System.Windows.Forms.GroupBox();
             L_DisplayForm = new System.Windows.Forms.Label();
-            L_DisplayGender = new System.Windows.Forms.Label();
+            L_DisplayGendered = new System.Windows.Forms.Label();
             CB_Gender = new System.Windows.Forms.ComboBox();
             CHK_DisplayShiny = new System.Windows.Forms.CheckBox();
             GB_Language = new System.Windows.Forms.GroupBox();
@@ -236,7 +236,7 @@ private void InitializeComponent()
             // GB_Displayed
             // 
             GB_Displayed.Controls.Add(L_DisplayForm);
-            GB_Displayed.Controls.Add(L_DisplayGender);
+            GB_Displayed.Controls.Add(L_DisplayGendered);
             GB_Displayed.Controls.Add(CB_Gender);
             GB_Displayed.Controls.Add(CHK_DisplayShiny);
             GB_Displayed.Controls.Add(CB_DisplayForm);
@@ -258,14 +258,14 @@ private void InitializeComponent()
             L_DisplayForm.Text = "Form:";
             L_DisplayForm.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
-            // L_DisplayGender
+            // L_DisplayGendered
             // 
-            L_DisplayGender.Location = new System.Drawing.Point(9, 25);
-            L_DisplayGender.Name = "L_DisplayGender";
-            L_DisplayGender.Size = new System.Drawing.Size(72, 20);
-            L_DisplayGender.TabIndex = 53;
-            L_DisplayGender.Text = "Gender:";
-            L_DisplayGender.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            L_DisplayGendered.Location = new System.Drawing.Point(9, 25);
+            L_DisplayGendered.Name = "L_DisplayGendered";
+            L_DisplayGendered.Size = new System.Drawing.Size(72, 20);
+            L_DisplayGendered.TabIndex = 53;
+            L_DisplayGendered.Text = "Gender:";
+            L_DisplayGendered.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // CB_Gender
             // 
@@ -674,7 +674,7 @@ private void InitializeComponent()
         private System.Windows.Forms.CheckBox CHK_SeenMale;
         private System.Windows.Forms.CheckBox CHK_IsNew;
         private System.Windows.Forms.Label L_DisplayForm;
-        private System.Windows.Forms.Label L_DisplayGender;
+        private System.Windows.Forms.Label L_DisplayGendered;
         private System.Windows.Forms.CheckedListBox CLB_FormCaught;
         private System.Windows.Forms.CheckedListBox CLB_FormShiny;
         private System.Windows.Forms.CheckBox CHK_SeenAlpha;
diff --git a/PKHeX.WinForms/Util/DevUtil.cs b/PKHeX.WinForms/Util/DevUtil.cs
index 8c5867937..19e196c35 100644
--- a/PKHeX.WinForms/Util/DevUtil.cs
+++ b/PKHeX.WinForms/Util/DevUtil.cs
@@ -273,7 +273,7 @@ private static void DumpStringsLegality()
         {
             var location = Path.Combine(dir, set.GetFileName(lang));
             var json = JsonSerializer.Serialize(entries, set.Info);
-            File.WriteAllText(location, json);
+            File.WriteAllText(location, json + Environment.NewLine);
         }
     }