diff --git a/data/sql/base/db_world/creature_loot_template.sql b/data/sql/base/db_world/creature_loot_template.sql
index 64907e783..0f5dbabab 100644
--- a/data/sql/base/db_world/creature_loot_template.sql
+++ b/data/sql/base/db_world/creature_loot_template.sql
@@ -281144,13 +281144,14 @@ INSERT INTO `creature_loot_template` VALUES
 (26536,26011,1,1,1,-26011,1),
 (26536,26012,1,1,1,-26012,1),
 (26536,26040,21.4,1,0,-26040,1),
-(26536,33370,3.6,1,0,1,1),
-(26536,33399,3.6,1,0,1,1),
-(26536,33454,7.1,1,0,1,1),
-(26536,36034,3.6,1,0,1,1),
-(26536,36359,3.6,1,0,1,1),
-(26536,37068,3.6,1,0,1,1),
-(26536,45912,0.1,1,0,1,1),
+(26536,33370,3.6,1,1,1,1),
+(26536,33399,3.6,1,1,1,1),
+(26536,33454,35.5,1,0,1,1),
+(26536,33470,10.7,1,0,1,7),
+(26536,37068,0.69,1,1,1,1),
+(26536,37069,0.69,1,1,1,1),
+(26536,37070,0.69,1,1,1,1),
+(26536,45912,0.1,1,1,1,1),
 (26544,24727,1.5,1,0,-24727,1),
 (26544,26000,3,1,1,-26000,1),
 (26544,26001,3,1,1,-26001,1),
@@ -304676,9 +304677,9 @@ INSERT INTO `creature_loot_template` VALUES
 (28124,33369,0.05,1,0,1,1),
 (28124,33371,0.05,1,0,1,1),
 (28124,33372,0.05,1,0,1,1),
-(28124,33373,0.1,1,0,1,1),
-(28124,33374,0.05,1,0,1,1);
+(28124,33373,0.1,1,0,1,1);
 INSERT INTO `creature_loot_template` VALUES 
+(28124,33374,0.05,1,0,1,1),
 (28124,33375,0.1,1,0,1,1),
 (28124,33376,0.1,1,0,1,1),
 (28124,33377,0.1,1,0,1,1),
diff --git a/data/sql/base/db_world/creature_template.sql b/data/sql/base/db_world/creature_template.sql
index 07940434b..a43aafa01 100644
--- a/data/sql/base/db_world/creature_template.sql
+++ b/data/sql/base/db_world/creature_template.sql
@@ -27558,7 +27558,7 @@ INSERT INTO `creature_template` VALUES
 (34653,0,0,0,0,0,29341,0,0,0,'Bountiful Table Hostess','','',10575,80,80,0,534,3,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (34654,0,0,0,0,0,29330,0,0,0,'Bountiful Feast Hostess','','',10575,80,80,0,714,3,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,33536,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (34655,0,0,0,0,0,29344,0,0,0,'Magic Rooster','','',0,80,80,2,35,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,0,2048,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340),
-(34657,36086,0,0,0,0,28735,0,0,0,'Jaelyne Evensong','Grand Champion of Darnassus','',0,80,80,2,1076,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(34657,36086,0,0,0,0,28735,0,0,0,'Jaelyne Evensong','Grand Champion of Darnassus','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
 (34658,0,0,0,0,0,9991,0,0,0,'Jaelyne Evensong\'s Mount','','',0,80,80,2,14,0,1,1.38571,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,430,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (34660,0,0,0,0,0,17612,0,0,0,'Anub\'arak','','',0,83,83,2,16,0,1,0.5,1,3,1,1,0,1,1,0,0,1,33587200,2048,8,0,0,0,0,0,371,535,135,6,1036,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,76,1,650854271,2097152,'npc_anubarak_spike',12340),
 (34675,0,0,0,0,0,29337,0,0,0,'Gregory Tabor','','',0,40,40,0,534,2,1,1.14286,1,0,56,74,0,136,1,2000,2000,1,33536,2048,0,0,0,0,0,0,39,57,14,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
@@ -27574,11 +27574,11 @@ INSERT INTO `creature_template` VALUES
 (34686,0,0,0,0,0,4587,0,0,0,'Healing Stream Totem','','',0,80,80,0,58,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,0.05,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (34687,0,0,0,0,0,4589,0,0,0,'Searing Totem','','',0,80,80,0,58,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,0.7,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (34694,0,0,0,0,0,29348,0,0,0,'Grunty','','',0,1,1,0,188,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,0,2048,0,0,0,0,0,0,1,1,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,121,1,0,0,'',12340),
-(34701,36083,0,0,0,0,28736,0,0,0,'Colosos','Grand Champion of the Exodar','',0,80,80,2,1694,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
-(34702,36082,0,0,0,0,28586,0,0,0,'Ambrose Boltspark','Grand Champion of Gnomeregan','',0,80,80,2,64,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
-(34703,36087,0,0,0,0,28564,0,0,0,'Lana Stouthammer','Grand Champion of Ironforge','',0,80,80,2,2155,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340),
+(34701,36083,0,0,0,0,28736,0,0,0,'Colosos','Grand Champion of the Exodar','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(34702,36082,0,0,0,0,28586,0,0,0,'Ambrose Boltspark','Grand Champion of Gnomeregan','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(34703,36087,0,0,0,0,28564,0,0,0,'Lana Stouthammer','Grand Champion of Ironforge','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340),
 (34704,0,0,0,0,0,1126,11686,0,0,'Val\'kyr Twins Bullet Stalker Dark','','',0,80,80,2,35,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,256,2048,0,0,0,0,0,0,345,509,103,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340),
-(34705,36088,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius','Grand Champion of Stormwind','',0,80,80,2,1078,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(34705,36088,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius','Grand Champion of Stormwind','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
 (34708,0,0,0,0,0,29324,0,0,0,'Caitrin Ironkettle','Cooking Trainer','',10568,40,40,0,534,83,1,1.14286,1,0,56,74,0,136,1,2000,2000,1,33536,2048,0,0,2,0,0,0,39,57,14,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (34709,0,0,0,0,0,29362,0,0,0,'Silver Riding Dragonhawk','','',0,40,40,0,2091,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1.15,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (34710,0,0,0,0,0,29400,0,0,0,'Ellen Moore','Cooking Trainer','',10568,40,40,0,534,83,1,1.14286,1,0,56,74,0,136,1,2000,2000,1,33536,2048,0,0,2,0,0,0,39,57,14,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
@@ -27907,12 +27907,12 @@ INSERT INTO `creature_template` VALUES
 (35293,0,0,0,0,0,29742,0,0,0,'Anmarie','Moonbell\'s Pet','',0,75,75,2,2027,0,1,1.14286,1,0,342,485,0,392,1,2000,2000,1,832,2048,0,26,0,0,0,0,295,438,68,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340),
 (35297,0,0,0,0,0,4449,26241,0,0,'Icecrown Cultist Proxy','',NULL,0,80,80,2,35,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,0,2048,0,0,0,0,0,0,1,1,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340),
 (35299,0,0,0,0,0,17759,0,0,0,'Royal Gryphon','','',0,75,75,2,1892,16777216,1,3.42857,1,0,2,2,0,24,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,107,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,241,1,0,0,'',12340),
-(35305,35306,0,0,0,0,29758,29759,0,0,'Argent Monk','','',0,80,80,2,16,0,1,1.14286,1,1,422,586,0,642,7.5,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,1,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340),
-(35306,0,0,0,0,0,29758,29759,0,0,'Argent Monk (1)','','',0,80,80,2,16,0,1,1.14286,1,1,422,586,0,642,13,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
-(35307,35308,0,0,0,0,29760,29761,0,0,'Argent Priestess','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,8,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340),
-(35308,0,0,0,0,0,29760,29761,0,0,'Argent Priestess (1)','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,12,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
-(35309,35310,0,0,0,0,29762,29763,0,0,'Argent Lightwielder','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,5,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340),
-(35310,0,0,0,0,0,29762,29763,0,0,'Argent Lightwielder (1)','','',0,80,80,2,16,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,10,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
+(35305,35306,0,0,0,0,29758,29759,0,0,'Argent Monk','','',0,80,80,2,14,0,1,1.14286,1,1,422,586,0,642,7.5,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,1,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340),
+(35306,0,0,0,0,0,29758,29759,0,0,'Argent Monk (1)','','',0,80,80,2,14,0,1,1.14286,1,1,422,586,0,642,13,2400,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,8,35305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
+(35307,35308,0,0,0,0,29760,29761,0,0,'Argent Priestess','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,8,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340),
+(35308,0,0,0,0,0,29760,29761,0,0,'Argent Priestess (1)','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,12,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
+(35309,35310,0,0,0,0,29762,29763,0,0,'Argent Lightwielder','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,7.5,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,8,5,1,0,0,0,0,0,0,0,0,1,0,0,'npc_argent_soldier',12340),
+(35310,0,0,0,0,0,29762,29763,0,0,'Argent Lightwielder (1)','','',0,80,80,2,14,0,1,1.14286,1,1,417,582,0,608,13,2400,0,2,2,2048,8,0,0,0,0,0,341,506,80,7,8,35309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,10,10,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (35311,36135,0,0,0,0,27769,0,0,0,'Fountain of Light','','',0,79,80,0,16,0,1,0.992063,1,0,1,1,0,1,1,0,0,1,131076,2048,8,0,0,0,0,0,1,1,1,11,1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'NullCreatureAI',0,3,1,1,1,1,0,0,0,0,0,0,0,0,0,650854271,2097154,'',12340),
 (35314,0,0,0,0,0,29090,0,0,0,'Orgrimmar Champion','','',0,80,80,2,14,0,1,2,1,1,422,586,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,345,509,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,5.95238,1,0,0,0,0,0,0,0,0,0,1,0,0,'npc_toc5_grand_champion_minion',12340),
 (35318,0,0,0,0,0,29688,29689,29682,29687,'Crimson Dawn Sailor','','',0,79,80,2,2123,0,1,1.14286,1,0,417,582,0,608,1,2000,2000,2,2,2048,0,0,0,0,0,0,341,506,80,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340),
@@ -28078,10 +28078,10 @@ INSERT INTO `creature_template` VALUES
 (35560,0,0,0,0,0,21300,0,0,0,'The Black Knight (1)','','',0,80,80,2,14,0,1,1.14286,1,1,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,6,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,20,1,1,0,0,0,0,0,0,0,0,1,8388624,0,'',12340),
 (35564,35568,0,0,0,0,25528,0,0,0,'Risen Arelas Brightstar','Black Knight\'s Minion','',0,80,80,2,14,0,1,1.14286,1,0,422,586,0,642,3,2400,0,1,0,2048,8,0,0,0,0,0,345,509,103,6,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2.5,1,1,0,0,0,0,0,0,0,0,1,0,0,'npc_black_knight_ghoul',12340),
 (35568,0,0,0,0,0,25528,0,0,0,'Risen Arelas Brightstar (1)','Black Knight\'s Minion','',0,80,80,2,14,0,1,1.14286,1,0,422,586,0,642,6,2400,0,1,0,2048,8,0,0,0,0,0,345,509,0,6,72,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,4,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
-(35569,36085,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger','Grand Champion of Silvermoon','',0,80,80,2,1604,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
-(35570,36091,0,0,0,0,28588,0,0,0,'Zul\'tore','Grand Champion of Sen\'jin','',0,80,80,2,126,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
-(35571,36090,0,0,0,0,28597,0,0,0,'Runok Wildmane','Grand Champion of the Thunder Bluff','',0,80,80,2,104,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
-(35572,36089,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher','Grand Champion of Orgrimmar','',0,80,80,2,29,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340),
+(35569,36085,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger','Grand Champion of Silvermoon','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(35570,36091,0,0,0,0,28588,0,0,0,'Zul\'tore','Grand Champion of Sen\'jin','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(35571,36090,0,0,0,0,28597,0,0,0,'Runok Wildmane','Grand Champion of the Thunder Bluff','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,7.5,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(35572,36089,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher','Grand Champion of Orgrimmar','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,441,1,2304,2097152,'boss_grand_champion',12340),
 (35573,0,0,0,0,0,29850,0,0,0,'Arcanist Asarina','Emblem of Triumph Quartermaster','',0,80,80,2,2027,128,1,1.14286,1,0,346,499,0,287,1,2000,2000,8,256,2048,0,0,0,0,0,0,315,468,69,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340),
 (35574,0,0,0,0,0,29851,0,0,0,'Magistrix Iruvia','Emblem of Triumph Quartermaster','',0,80,80,2,2123,128,1,1.14286,1,0,346,499,0,287,1,2000,2000,8,256,2048,0,0,0,0,0,0,315,468,69,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340),
 (35575,0,0,0,0,0,29853,0,0,0,'Champion Isimode','Triumphant Armor Vendor','',0,80,80,2,2027,128,1,1.14286,1,0,417,582,0,608,1,2000,2000,2,256,2048,0,0,0,0,0,0,341,506,80,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,2,'',12340),
@@ -28113,7 +28113,7 @@ INSERT INTO `creature_template` VALUES
 (35614,0,0,0,0,0,21955,11686,0,0,'Desecration Stalker','','',0,80,80,2,14,0,1,1.14286,1,0,422,586,0,642,1,2000,2000,1,0,2048,0,0,0,0,0,0,345,509,103,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340),
 (35615,0,0,0,0,0,29268,0,0,0,'Anub\'arak (2)','','',0,83,83,2,14,0,1,1.3,1,3,1200,1300,0,805,60,0,0,1,0,2048,8,0,0,0,0,0,371,535,135,6,108,35615,0,70214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,569703,569703,'',0,3,1,390,1,1,0,0,0,0,0,0,0,191,1,650854271,2097153,'',12340),
 (35616,0,0,0,0,0,29268,0,0,0,'Anub\'arak (3)','','',0,83,83,2,14,0,1,1.3,1,3,1200,1300,0,805,90,0,0,1,0,2048,8,0,0,0,0,0,371,535,135,6,108,35616,0,70214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,569703,569703,'',0,3,1,1950,1,1,0,0,0,0,0,0,0,191,1,650854271,2097153,'',12340),
-(35617,36084,0,0,0,0,28589,0,0,0,'Deathstalker Visceri','Grand Champion of Undercity','',0,80,80,2,68,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
+(35617,36084,0,0,0,0,28589,0,0,0,'Deathstalker Visceri','Grand Champion of Undercity','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,7.5,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,15,20,1,0,0,0,0,0,0,0,0,1,2304,2097152,'boss_grand_champion',12340),
 (35633,0,0,0,0,0,28571,0,0,0,'Ambrose Boltspark\'s Mount','','',0,80,80,2,14,0,1,1.38571,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,478,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (35634,0,0,0,0,0,10718,0,0,0,'Deathstalker Visceri\'s Mount','','',0,80,80,2,14,0,1,1.28968,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,479,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (35635,0,0,0,0,0,28607,0,0,0,'Eressea Dawnsinger\'s Mount','','',0,80,80,2,14,0,1,1.38571,1,0,422,586,0,642,1,2000,2000,1,33587456,2048,0,0,0,0,0,0,345,509,103,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,480,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
@@ -28252,16 +28252,16 @@ INSERT INTO `creature_template` VALUES
 (36074,0,0,0,0,0,29974,0,0,0,'[DND] Swift Horde Wolf','','',0,10,10,0,35,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340),
 (36075,0,0,0,0,0,29975,0,0,0,'[DND] White Stallion','','',0,1,2,0,35,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340),
 (36076,0,0,0,0,0,29976,0,0,0,'[DND] Swift Alliance Steed','','',0,80,80,2,35,0,1,1.14286,1,0,0,0,0,0,1,2000,2000,1,0,2048,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1,1,1,0,0,0,0,0,0,0,140,1,0,0,'',12340),
-(36082,0,0,0,0,0,28586,0,0,0,'Ambrose Boltspark (1)','Grand Champion of Gnomeregan','',0,80,80,2,64,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
-(36083,0,0,0,0,0,28736,0,0,0,'Colosos (1)','Grand Champion of the Exodar','',0,80,80,2,1694,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
-(36084,0,0,0,0,0,28589,0,0,0,'Deathstalker Visceri (1)','Grand Champion of Undercity','',0,80,80,2,68,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
-(36085,0,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger (1)','Grand Champion of Silvermoon','',0,80,80,2,1604,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
-(36086,0,0,0,0,0,28735,0,0,0,'Jaelyne Evensong (1)','Grand Champion of Darnassus','',0,80,80,2,1076,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
-(36087,0,0,0,0,0,28564,0,0,0,'Lana Stouthammer (1)','Grand Champion of Ironforge','',0,80,80,2,2155,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340),
-(36088,0,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius (1)','Grand Champion of Stormwind','',0,80,80,2,1078,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
-(36089,0,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher (1)','Grand Champion of Orgrimmar','',0,80,80,2,29,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340),
-(36090,0,0,0,0,0,28597,0,0,0,'Runok Wildmane (1)','Grand Champion of the Thunder Bluff','',0,80,80,2,104,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
-(36091,0,0,0,0,0,28588,0,0,0,'Zul\'tore (1)','Grand Champion of Sen\'jin','',0,80,80,2,126,0,1,2,1,1,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36082,0,0,0,0,0,28586,0,0,0,'Ambrose Boltspark (1)','Grand Champion of Gnomeregan','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2112,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36083,0,0,0,0,0,28736,0,0,0,'Colosos (1)','Grand Champion of the Exodar','',0,80,80,2,14,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36084,0,0,0,0,0,28589,0,0,0,'Deathstalker Visceri (1)','Grand Champion of Undercity','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36085,0,0,0,0,0,28637,0,0,0,'Eressea Dawnsinger (1)','Grand Champion of Silvermoon','',0,80,80,2,14,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36086,0,0,0,0,0,28735,0,0,0,'Jaelyne Evensong (1)','Grand Champion of Darnassus','',0,80,80,2,14,0,1,2,1,1,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36087,0,0,0,0,0,28564,0,0,0,'Lana Stouthammer (1)','Grand Champion of Ironforge','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340),
+(36088,0,0,0,0,0,28560,0,0,0,'Marshal Jacob Alerius (1)','Grand Champion of Stormwind','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36089,0,0,0,0,0,28587,0,0,0,'Mokra the Skullcrusher (1)','Grand Champion of Orgrimmar','',0,80,80,2,14,0,1,2,1,0,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,441,1,2304,2097153,'',12340),
+(36090,0,0,0,0,0,28597,0,0,0,'Runok Wildmane (1)','Grand Champion of the Thunder Bluff','',0,80,80,2,14,0,1,2,1,0,617,782,0,608,13,0,0,2,2,2048,8,0,0,0,0,0,541,706,80,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
+(36091,0,0,0,0,0,28588,0,0,0,'Zul\'tore (1)','Grand Champion of Sen\'jin','',0,80,80,2,14,0,1,2,1,1,622,786,0,642,13,0,0,1,2,2048,8,0,0,0,0,0,545,709,103,7,2048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,25,20,1,0,0,0,0,0,0,0,0,1,2304,2097153,'',12340),
 (36093,0,0,0,0,0,21955,11686,0,0,'Vault Stalker','','',0,1,1,0,14,0,1,1.14286,1,0,2,2,0,24,1,2000,2000,1,33554432,2048,0,0,0,0,0,0,1,1,0,10,1048576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,2,1,1,0,0,0,0,0,0,0,0,1,0,128,'',12340),
 (36095,0,0,0,0,0,29860,0,0,0,'Highlord Tirion Fordring','','',10709,83,83,2,2070,1,1,1.14286,1,3,496,674,0,783,35,2000,2000,2,33600,2048,0,0,0,0,0,0,365,529,98,7,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1,1000,1000,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
 (36097,0,0,0,0,0,29984,0,0,0,'Argent Mage','','',0,80,80,2,2070,0,1,1.14286,1,0,346,499,0,287,1,0,0,8,512,2048,8,0,0,0,0,0,315,468,69,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'NullCreatureAI',0,3,1,5,5,1,0,0,0,0,0,0,0,0,1,0,0,'',12340),
diff --git a/data/sql/base/db_world/spell_area.sql b/data/sql/base/db_world/spell_area.sql
index 5c293fdfd..ef81122ec 100644
--- a/data/sql/base/db_world/spell_area.sql
+++ b/data/sql/base/db_world/spell_area.sql
@@ -537,8 +537,6 @@ INSERT INTO `spell_area` VALUES
 (60778,4171,12500,0,0,0,2,1,64,11),
 (60778,4172,12499,0,0,0,2,1,64,11),
 (60778,4172,12500,0,0,0,2,1,64,11),
-(60815,14,13242,13257,0,690,2,1,74,11),
-(60815,14,13347,13370,0,1101,2,1,74,11),
 (60815,1637,13242,13257,0,690,2,1,74,11),
 (60815,1637,13347,13370,0,1101,2,1,74,11),
 (60877,1519,13347,13377,0,1101,2,1,74,11),