diff --git a/characters/js/table.js b/characters/js/table.js
index 5a2ae5401..5e76bc972 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -278,8 +278,9 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage) {
         if (filters.globalKC && [ 4075, 4076, 4058, 4060, 4062, 4065, 4064, 4074, 4066, 4071, 4072, 4073, 4068, 4067, 4063, 3336, 4080, 3227, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 3886, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 4054, 4055, 2443, 2469, 2510, 2618, 3393, 3417, 4041, 4043, 3948, 3809, 3745, 3536, 3950, 3926, 3749, 3824, 3391, 3349, 3825, 3760, 3761, 3737, 3624, 3548, 3509, 3392, 3212, 3151, 5062, 5063, 5064, 5065, 5176, 5177, 5178, 5179, 5333, 5334, 5335, 5336 ].indexOf(id) == -1) return false;
         if (filters.globalPKA && [ 2936, 2940, 2938, 2942, 2944, 2948, 2946, 2952, 2950, 3884, 4025, 3999, 3976, 3952, 3927, 3885, 3305, 3304, 3353, 3382, 3401, 3400, 3425, 4021, 3874, 3903, 3887, 3855, 3835, 3796, 3815, 3795, 3770, 3743, 3750, 3728, 3713, 3678, 3657, 3620, 3634, 3601, 3560, 3579, 3559, 3520, 3539, 3518, 3481, 3498, 3477, 3436, 4047, 3886, 4033, 4067, 4068, 4041, 4043, 4044, 4045, 4046, 4053, 4056, 4058, 4065, 4066, 4060, 4062, 4063, 4064, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 4074, 4080, 4078, 4079, 4087, 4086, 4085, 4082, 4084 ].indexOf(id) == -1) return false;
         
-        if (filters.yamatovskaido && [ 4060, 4058, 4062, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 4064, 4065, 4056, 4063, 4066, 4066, 4066, 4041, 4043, 3814, 3336, 3338, 4044, 4045, 4046, 4047, 4053, 3877, 3878, 3889, 3896, 3430, 3611, 3788, 3991, 4050, 4051, 4052, 4054, 4055, 4048, 4049, 3886, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 2443, 2469, 2510, 2618, 3784, 3629, 3631, 3650, 3652, 3654, 3723, 3766, 3809, 3850, 3852, 3870, 3891, 3898, 3908, 3910, 3944, 3948, 3959, 3986, 3993, 3995, 3385, 3811, 3786, 3519, 5453, 5454, 5455, 5456, 5457, 5458, 5459, 5460, 5417, 5418, 5419, 5420, 5431, 5432, 5062, 5063, 5064, 5065, 5176, 5177, 5178, 5179, 5474, 5475, 5480, 5481, 5482, 5483, 5543, 5544, 5545, 5546, 5437, 5438, 5439, 5440 ].indexOf(id) == -1) return false;
+        if (filters.comodorevsempress && [ 4100, 4102, 4103, 4104, 4105, 4106, 4107, 4109, 4089, 4098, 4096, 4097, 2897, 4082, 4084, 4087, 4086, 4085, 4088, 4092, 4093, 4094, 3886, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 2729, 2831, 2792, 2977, 3154, 3739, 3280, 3641, 3532, 2037, 3296, 3297, 3294, 3635, 3287, 3293, 3283, 1445, 2434, 3038, 3452, 3780, 3352, 1743, 1741, 2996, 1745, 2998, 4029, 3738, 2795, 3466, 3942, 2990, 3295, 5192, 5193, 5194, 5307, 5308, 5309, 5172, 5173, 5174, 5175 ].indexOf(id) == -1) return false;
         
+        if (filters.yamatovskaido && [ 4060, 4058, 4062, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 4064, 4065, 4056, 4063, 4066, 4066, 4066, 4041, 4043, 3814, 3336, 3338, 4044, 4045, 4046, 4047, 4053, 3877, 3878, 3889, 3896, 3430, 3611, 3788, 3991, 4050, 4051, 4052, 4054, 4055, 4048, 4049, 3886, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 2443, 2469, 2510, 2618, 3784, 3629, 3631, 3650, 3652, 3654, 3723, 3766, 3809, 3850, 3852, 3870, 3891, 3898, 3908, 3910, 3944, 3948, 3959, 3986, 3993, 3995, 3385, 3811, 3786, 3519, 5453, 5454, 5455, 5456, 5457, 5458, 5459, 5460, 5417, 5418, 5419, 5420, 5431, 5432, 5062, 5063, 5064, 5065, 5176, 5177, 5178, 5179, 5474, 5475, 5480, 5481, 5482, 5483, 5543, 5544, 5545, 5546, 5437, 5438, 5439, 5440 ].indexOf(id) == -1) return false;
         if (filters.LuffyvsKaido && [ 3956, 3959, 3960, 3961, 3430, 3946, 3952, 3954, 3922, 3924, 3948, 5500, 5501, 5502, 5503, 5508, 5509, 5510, 5511, 3949, 3950, 3951, 3894, 3903, 3887, 3877, 3878, 3889, 3896, 3880, 3881, 3882, 3883, 3891, 3898, 3870, 3852, 3536, 3555, 3850, 3824, 3775, 3576, 3857, 3856, 3768, 3886, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3749, 2813, 2649, 3231, 2908, 3153, 3309, 3676, 3493, 3495, 3674, 3519, 3433, 5453, 5454, 5455, 5456, 5457, 5458, 5459, 5460, 5465, 5466, 5467, 5468, 5401, 5402, 5403, 5404, 5353, 5354, 5355, 5356, 5361, 5362, 5363, 5364, 5345, 5346, 5347, 5348 ].indexOf(id) == -1) return false;
         if (filters.strawhatdiva && [ 4011, 4012, 4020, 4022, 4023, 4025, 4021, 4008, 4006, 4010, 2330, 3993, 3995, 3996, 3997, 3998, 4024, 4003, 4004, 4005, 4009, 4000, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 2749, 2758, 2299, 2763, 3695, 3697, 3845, 3358, 3120, 3708, 3121, 3672, 3688, 3684, 3685, 3679, 3683, 3686, 3687, 3689, 3682, 2681, 2672, 3706, 3742, 3884, 3886, 5543, 5544, 5545, 5546, 5551, 5552, 5553, 5554, 5445, 5446, 5447, 5448, 5425, 5426, 5427, 5428 ].indexOf(id) == -1) return false;
         if (filters.worldClash && [ 253, 1041, 255, 257, 259, 979, 980, 983, 453, 455, 457, 946, 947, 948, 1182, 1528, 1186, 1188, 1190, 1270, 1509, 1510, 1511, 1606, 451, 981, 1184, 1272, 1512, 1607, 1222, 1276, 1278, 1602, 1608, 1700, 1798, 1989, 2037, 1047, 1492, 1972, 447, 1268, 575, 2025, 978, 2034, 1298, 2023, 1380, 2007, 1846, 1416, 1847, 2066, 408, 1927, 1345, 1593, 649, 1251, 1991, 1387, 2401, 2403, 2405 ].indexOf(id) == -1) return false;
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 37e754a31..915324a00 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -255,15 +255,15 @@
         <i class="pull-right fa fa-{{filters.tmkcEnabled ? 'chevron-up' : 'chevron-down'}}"></i>
     </span>
     <span class="filter width-12 exc" ng-model="filters.globalTM" ng-class="{ active: filters.globalTM }"
-        ng-click="filters.globalTM = !filters.globalTM">Treasure Map Boosters [Lilith (again)]</span>
+        ng-click="filters.globalTM = !filters.globalTM">Treasure Map Boosters [Bonney]</span>
     <!--span class="filter width-6 exc" ng-model="filters.japanTM" ng-class="{ active: filters.japanTM }"
         ng-click="filters.japanTM = !filters.japanTM">Show Japan TM Boosters [Hyogoro the Flower]</span-->
     <span class="filter width-12 exc" ng-model="filters.globalKC" ng-class="{ active: filters.globalKC }"
         ng-click="filters.globalKC = !filters.globalKC">Kizuna Clash Boosters [Alber]</span>
     <span class="filter width-12 exc" ng-model="filters.globalPKA" ng-class="{ active: filters.globalPKA }"
         ng-click="filters.globalPKA = !filters.globalPKA">Pirate King Adventure Boosters [Lilith]</span>
-    <span class="filter width-12 exc" ng-model="filters.yamatovskaido" ng-class="{ active: filters.yamatovskaido }"
-        ng-click="filters.yamatovskaido = !filters.yamatovskaido">Blitz Battle Boosters [Yamato VS Kaido]</span>
+    <span class="filter width-12 exc" ng-model="filters.comodorevsempress" ng-class="{ active: filters.comodorevsempress }"
+        ng-click="filters.comodorevsempress = !filters.comodorevsempress">Blitz Battle Boosters [Commodore VS Empress]</span>
     <!--span class="filter width-6 exc" ng-model="filters.japanKC" ng-class="{ active: filters.japanKC }"
         ng-click="filters.japanKC = !filters.japanKC">Show Japan KC Boosters [Basil Hawkins]</span-->
     <!--span class="filter width-12 exc" ng-model="filters.odenKaidoBlitz" ng-class="{ active: filters.odenKaidoBlitz }"
diff --git a/common/data/details.js b/common/data/details.js
index cb80cc5ce..e5b94f02d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -145150,7 +145150,7 @@ window.details = {
             base: "Boosts base ATK of Driven characters by 60",
             level1: "Makes [RCV] orbs beneficial for Driven characters"
         },
-        special: "Reduces Bind duration by 6 turns, and changes all orbs, including [BLOCK] orbs, into Matching orbs. If the enemy has Percent Damage Reduction Buff for 6 or more turns or if the enemy doesn't have Percent Damage Reduction Buff when the Special is activated, reduces enemies' [STR] Resistance by -30% for 1 turn. If the enemy doesn't have Percent Damage Reduction Buff when the Special is activated, reduces enemies' damage received by 80% for 6 turns. If during that turn you score 2 PERFECT hits, inflicts Weakened, 1.2x increased damage and an additional 1.4x if enemies are inflicted with Increased Damage Taken debuff, to all enemies for 1 turn in the next turn.",
+        special: "Reduces Bind duration by 6 turns, and changes all other orbs, including [BLOCK] orbs, of all characters into this character's orb. If the enemy has Percent Damage Reduction Buff for 6 or more turns or if the enemy doesn't have Percent Damage Reduction Buff when the Special is activated, reduces enemies' [STR] Resistance by -30% for 1 turn. If the enemy doesn't have Percent Damage Reduction Buff when the Special is activated, reduces enemies' damage received by 80% for 6 turns. If during that turn you score 2 PERFECT hits, inflicts Weakened, 1.2x increased damage and an additional 1.4x if enemies are inflicted with Increased Damage Taken debuff, to all enemies for 1 turn in the next turn.",
         specialName: "Scythe from Above",
         support: [
             {