Quantcast

Dataminer update and run, should fix some of the faction errors

Ackis [10-22-08 - 16:54]
Dataminer update and run, should fix some of the faction errors
Filename
ARLDataminer.rb
AckisRecipeList.lua
AckisRecipeList.toc
RecipeDB/ARL-Alchemy.lua
RecipeDB/ARL-BlackSmith.lua
RecipeDB/ARL-Cook.lua
RecipeDB/ARL-Enchant.lua
RecipeDB/ARL-Engineer.lua
RecipeDB/ARL-Jewelcraft.lua
RecipeDB/ARL-LeatherWork.lua
RecipeDB/ARL-Tailor.lua
RecipeDB/ARL-Trainer.lua
RecipeDB/ARL-Vendor.lua
diff --git a/ARLDataminer.rb b/ARLDataminer.rb
index 1076ab5..076440b 100644
--- a/ARLDataminer.rb
+++ b/ARLDataminer.rb
@@ -262,6 +262,14 @@ EOF

 							unless npc[:react].nil?

+								# NPC React Flags:
+								# 1 = friendly
+								# 2 = neutral
+								# 3 = hostile
+								# ARL Flags:
+								# 0 = neutral
+								#  1 = Alliance
+								# 2 = Horde
 								react_a = npc[:react][0].nil? ? 0 : npc[:react][0]
 								react_h = npc[:react][1].nil? ? 0 : npc[:react][1]

@@ -273,7 +281,7 @@ EOF
 									flags << 2
 								end

-								$trainers[npc[:id]][:faction] = react_h < 3 && react_a < 3 ? 0 : react_h == 3 && react_a < 3 ? 1 : react_a == 3 && react_h < 3 ? 2 : 4
+								$trainers[npc[:id]][:faction] = react_h < 3 && react_a < 3 ? 0 : react_h == 3 && react_a < 3 ? 1 : react_a == 3 && react_h < 3 ? 2 : 0

 							else

@@ -314,18 +322,14 @@ EOF
 								react_h = npc[:react][1].nil? ? 0 : npc[:react][1]

 								if react_a < 3
-
 									flags << 1
-
 								end

 								if react_h < 3
-
 									flags << 2
-
 								end

-								$vendors[npc[:id]][:faction] = react_h < 3 && react_a < 3 ? 0 : react_h == 3 && react_a < 3 ? 1 : react_a == 3 && react_h < 3 ? 2 : 4
+								$vendors[npc[:id]][:faction] = react_h < 3 && react_a < 3 ? 0 : react_h == 3 && react_a < 3 ? 1 : react_a == 3 && react_h < 3 ? 2 : 0

 							else

@@ -379,18 +383,14 @@ EOF
 								react_h = npc[:react][1].nil? ? 0 : npc[:react][1]

 								if react_a < 3
-
 									flags << 1
-
 								end

 								if react_h < 3
-
 									flags << 2
-
 								end

-								$vendors[npc[:id]][:faction] = react_h < 3 && react_a < 3 ? 0 : react_h == 3 && react_a < 3 ? 1 : react_a == 3 && react_h < 3 ? 2 : 4
+								$vendors[npc[:id]][:faction] = react_h < 3 && react_a < 3 ? 0 : react_h == 3 && react_a < 3 ? 1 : react_a == 3 && react_h < 3 ? 2 : 0

 							else

@@ -680,43 +680,6 @@ EOF

 		# Item Stats:
 		# :item_stats => [{:val=>x, id=> y}]
-		# IDs:
-		# 1 = Strength
-		# 2 = Agility
-		# 3 = Stamina
-		# 4 = Intelligence
-		# 5 = Spirit
-		# 6 = Armor
-		# 7 = Weapon Damage
-		# 8 = Weapon Speed
-		# 9 = Attack Power
-		# 10 =
-		# 11 = Melee Critical Strike
-		# 12 = Expertise rating
-		# 13 =
-		# 14 = Ranged Weapon Damage
-		# 15 = Ranged Weapon Speed
-		# 16 = Ranged Attack Power
-		# 17 = Hit Rating
-		# 18 = Ranged Critical Strike
-		# 19 = Spell Damage
-		# 20 = Healing
-		# 21 = Spell Hit Rating
-		# 22 = Spell Critical Strike
-		# 23 = Spell Penetration
-		# 24 = Mana per 5
-		# 25 =
-		# 26 = Dodge
-		# 27 = Parry
-		# 28 = Shield Block Rating
-		# 29 = Resillience
-		# 30 = Melee Haste
-		# 31 = Defense
-		# 32 = Resist
-		# 33 = Fire Resist
-		# 34 = Resist
-		# 35 = Resist
-		# 36 = Resist

 		unless details[:item_stats] == nil

@@ -1139,55 +1102,74 @@ $bosslist = ["Ras Frostwhisper","Onyxia","Gyth","General Drakkisath","Balnazzar"

 #TODO: for these functions, how can I do it so I can set a debug parameter which would only cause First Aid to run?

-# Discovery: 28583, 28580, 28584, 28585, 28582, 28581, 28587, 28588, 28589, 28590, 28591, 28586, 41458, 41500, 41501, 41502, 41503
-# Seasonal: 21923 - 1
-alchemy = recipes.get_alchemy_list
-create_profession_db("./RecipeDB/ARL-Alchemy.lua","Alchemy",recipes,maps,"InitAlchemy",alchemy,[2336,6619,11447,17579,22430],[],[28583, 28580, 28584, 28585, 28582, 28581, 28587, 28588, 28589, 28590, 28591, 28586, 41458, 41500, 41501, 41502, 41503],{21923 => 1},[53771,53773,53774,53775,53776,53777,53779,53780,53781,53782,53783,53784,53812,53836,53837,53838,53839,53840,53841,53842,53847,53895,53899,53905],{})
+$debug = false
+
+if $debug

-# Seasonal: 21913 - 1
-blacksmithing = recipes.get_blacksmithing_list
-create_profession_db("./RecipeDB/ARL-BlackSmith.lua","Blacksmithing",recipes,maps,"InitBlacksmithing",blacksmithing,[],[],[],{21913 => 1},[52567,52568,52569,52570,52571,52572],{})
+	firstaid = recipes.get_firstaid_list
+	create_profession_db("./RecipeDB/ARL-FirstAid.lua","First Aid",recipes,maps,"InitFirstAid",firstaid,[30021],[],[],{},[45545, 45546, 51801],{})

-# Seasonal: 21143 - 1, 21144 - 1, 45022 - 1
-cooking = recipes.get_cooking_list
-create_profession_db("./RecipeDB/ARL-Cook.lua","Cooking",recipes,maps,"InitCooking",cooking,[30047],[],[],{21143 => 1,21144 => 1,45022 => 1},[44438, 45547, 45559,45571, 53056],{})
+	create_lookup_db("./RecipeDB/ARL-Trainer.lua","Trainer","TrainerDB","InitTrainer",$trainers,maps,[])

-# Seasonal: 21931 - 1, 46578 - 4
-enchanting = recipes.get_enchanting_list
-create_profession_db("./RecipeDB/ARL-Enchant.lua","Enchanting",recipes,maps,"InitEnchanting",enchanting,[22434,28021],[],[],{21931 => 1, 46578 => 4},[27958,47672,44558,44613,44632,44633,44634,44635,44636,44637,44638,44645,47898,47899,47901,44582,44584,44588,44589,44590,44591,44592,44595,44596,44597,44598,44612,44613,44616,44621,44623,44625,44629,44630,44631,44529,44555,44556,44528,44524,44513,44483,44484,44488,44489,44492,44494,44496,44497,44500,44506,44508,44509,44510,44575],{})
+	create_lookup_db("./RecipeDB/ARL-Vendor.lua","Vendor","VendorDB","InitVendor",$vendors,maps,[])

-# Seasonal: 21940 - 1, 26416, 26417, 26418, 26420, 26421, 26422, 26423, 26424, 26425, 26442, 26426, 26427, 26428, 26443 - 2
-eng = recipes.get_engineering_list
-create_profession_db("./RecipeDB/ARL-Engineer.lua","Engineering",recipes,maps,"InitEngineering",eng,[],[],[],{21940 => 1,26416 => 2,26417 => 2,26418 => 2,26420 => 2,26421 => 2,26422 => 2,26423 => 2,26424 => 2,26425 => 2,26426 => 2,26427 => 2,26428 => 2,26442 => 2,26443 => 2},[53280,53281],{})
+	create_lookup_db("./RecipeDB/ARL-Mob.lua","Monster","MobDB","InitMob",$monsters,maps,[])

-firstaid = recipes.get_firstaid_list
-create_profession_db("./RecipeDB/ARL-FirstAid.lua","First Aid",recipes,maps,"InitFirstAid",firstaid,[30021],[],[],{},[45545, 45546, 51801],{})
+	create_lookup_db("./RecipeDB/ARL-Quest.lua","Quest","QuestDB","InitQuest",$quests,maps,[])

-inscription = recipes.get_inscription_list
-create_profession_db("./RecipeDB/ARL-Inscription.lua","Inscription",recipes,maps,"InitInscription",inscription,[50598,50599,50600,50601,50602,50605,50606,50607,50608,50609,50612,50614,50616,50617,50618],[],[],{},[],{})
+else

-# PVP: 31101, 43493
-jewelcrafting = recipes.get_jewelcrafting_list
-create_profession_db("./RecipeDB/ARL-Jewelcraft.lua","Jewelcrafting",recipes,maps,"InitJewelcrafting",jewelcrafting,[53844],[31101, 43493],[],{},(53830..54023).to_a,{})
+	# Discovery: 28583, 28580, 28584, 28585, 28582, 28581, 28587, 28588, 28589, 28590, 28591, 28586, 41458, 41500, 41501, 41502, 41503
+	# Seasonal: 21923 - 1
+	alchemy = recipes.get_alchemy_list
+	create_profession_db("./RecipeDB/ARL-Alchemy.lua","Alchemy",recipes,maps,"InitAlchemy",alchemy,[2336,6619,11447,17579,22430],[],[28583, 28580, 28584, 28585, 28582, 28581, 28587, 28588, 28589, 28590, 28591, 28586, 41458, 41500, 41501, 41502, 41503],{21923 => 1},[53771,53773,53774,53775,53776,53777,53779,53780,53781,53782,53783,53784,53812,53836,53837,53838,53839,53840,53841,53842,53847,53895,53899,53905],{})

-# Seasonal: 21943 - 1, 44953 - 1
-leatherworking = recipes.get_leatherworking_list
-create_profession_db("./RecipeDB/ARL-LeatherWork.lua","Leatherworking",recipes,maps,"InitLeatherworking",leatherworking,[],[],[],{21943 => 1,44953 => 1},(50935..53690).to_a,{})
+	# Seasonal: 21913 - 1
+	blacksmithing = recipes.get_blacksmithing_list
+	create_profession_db("./RecipeDB/ARL-BlackSmith.lua","Blacksmithing",recipes,maps,"InitBlacksmithing",blacksmithing,[],[],[],{21913 => 1},[52567,52568,52569,52570,52571,52572],{})

-smelting = recipes.get_mining_list
-create_profession_db("./RecipeDB/ARL-Smelt.lua","Smelting",recipes,maps,"InitSmelting",smelting,[],[],[],{},[49252, 49258, 53417],{})
+	# Seasonal: 21143 - 1, 21144 - 1, 45022 - 1
+	cooking = recipes.get_cooking_list
+	create_profession_db("./RecipeDB/ARL-Cook.lua","Cooking",recipes,maps,"InitCooking",cooking,[30047],[],[],{21143 => 1,21144 => 1,45022 => 1},[44438, 45547, 45559,45571, 53056],{})

-# Seasonal: 21945 - 1, 44958 - 1, 44950 - 1, 26407 - 1, 26403 - 2
-tailoring = recipes.get_tailoring_list
-create_profession_db("./RecipeDB/ARL-Tailor.lua","Tailoring",recipes,maps,"InitTailoring",tailoring,[7636,12062,12063,12068,12083,12087,12090],[],[],{21945 => 1, 44958 => 1, 44950 => 1, 26407 => 1, 26403 => 2},[],{})
+	# Seasonal: 21931 - 1, 46578 - 4
+	enchanting = recipes.get_enchanting_list
+	create_profession_db("./RecipeDB/ARL-Enchant.lua","Enchanting",recipes,maps,"InitEnchanting",enchanting,[22434,28021],[],[],{21931 => 1, 46578 => 4},[27958,47672,44558,44613,44632,44633,44634,44635,44636,44637,44638,44645,47898,47899,47901,44582,44584,44588,44589,44590,44591,44592,44595,44596,44597,44598,44612,44613,44616,44621,44623,44625,44629,44630,44631,44529,44555,44556,44528,44524,44513,44483,44484,44488,44489,44492,44494,44496,44497,44500,44506,44508,44509,44510,44575],{})

-create_lookup_db("./RecipeDB/ARL-Trainer.lua","Trainer","TrainerDB","InitTrainer",$trainers,maps,[])
+	# Seasonal: 21940 - 1, 26416, 26417, 26418, 26420, 26421, 26422, 26423, 26424, 26425, 26442, 26426, 26427, 26428, 26443 - 2
+	eng = recipes.get_engineering_list
+	create_profession_db("./RecipeDB/ARL-Engineer.lua","Engineering",recipes,maps,"InitEngineering",eng,[],[],[],{21940 => 1,26416 => 2,26417 => 2,26418 => 2,26420 => 2,26421 => 2,26422 => 2,26423 => 2,26424 => 2,26425 => 2,26426 => 2,26427 => 2,26428 => 2,26442 => 2,26443 => 2},[53280,53281],{})

-create_lookup_db("./RecipeDB/ARL-Vendor.lua","Vendor","VendorDB","InitVendor",$vendors,maps,[])
+	firstaid = recipes.get_firstaid_list
+	create_profession_db("./RecipeDB/ARL-FirstAid.lua","First Aid",recipes,maps,"InitFirstAid",firstaid,[30021],[],[],{},[45545, 45546, 51801],{})

-create_lookup_db("./RecipeDB/ARL-Mob.lua","Monster","MobDB","InitMob",$monsters,maps,[])
+	inscription = recipes.get_inscription_list
+	create_profession_db("./RecipeDB/ARL-Inscription.lua","Inscription",recipes,maps,"InitInscription",inscription,[50598,50599,50600,50601,50602,50605,50606,50607,50608,50609,50612,50614,50616,50617,50618],[],[],{},[],{})

-create_lookup_db("./RecipeDB/ARL-Quest.lua","Quest","QuestDB","InitQuest",$quests,maps,[])
+	# PVP: 31101, 43493
+	jewelcrafting = recipes.get_jewelcrafting_list
+	create_profession_db("./RecipeDB/ARL-Jewelcraft.lua","Jewelcrafting",recipes,maps,"InitJewelcrafting",jewelcrafting,[53844],[31101, 43493],[],{},(53830..54023).to_a,{})
+
+	# Seasonal: 21943 - 1, 44953 - 1
+	leatherworking = recipes.get_leatherworking_list
+	create_profession_db("./RecipeDB/ARL-LeatherWork.lua","Leatherworking",recipes,maps,"InitLeatherworking",leatherworking,[],[],[],{21943 => 1,44953 => 1},(50935..53690).to_a,{})
+
+	smelting = recipes.get_mining_list
+	create_profession_db("./RecipeDB/ARL-Smelt.lua","Smelting",recipes,maps,"InitSmelting",smelting,[],[],[],{},[49252, 49258, 53417],{})
+
+	# Seasonal: 21945 - 1, 44958 - 1, 44950 - 1, 26407 - 1, 26403 - 2
+	tailoring = recipes.get_tailoring_list
+	create_profession_db("./RecipeDB/ARL-Tailor.lua","Tailoring",recipes,maps,"InitTailoring",tailoring,[7636,12062,12063,12068,12083,12087,12090],[],[],{21945 => 1, 44958 => 1, 44950 => 1, 26407 => 1, 26403 => 2},[],{})
+
+	create_lookup_db("./RecipeDB/ARL-Trainer.lua","Trainer","TrainerDB","InitTrainer",$trainers,maps,[])
+
+	create_lookup_db("./RecipeDB/ARL-Vendor.lua","Vendor","VendorDB","InitVendor",$vendors,maps,[])
+
+	create_lookup_db("./RecipeDB/ARL-Mob.lua","Monster","MobDB","InitMob",$monsters,maps,[])
+
+	create_lookup_db("./RecipeDB/ARL-Quest.lua","Quest","QuestDB","InitQuest",$quests,maps,[])
+
+end

 puts "\nGenerating Local file .. #{$localstring.length} strings to process"

diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua
index bef1804..dcfd72a 100644
--- a/AckisRecipeList.lua
+++ b/AckisRecipeList.lua
@@ -585,7 +585,11 @@ function addon:addLookupList(DB, ID, Name, Loc, Coordx, Coordy, Faction)

 	if (Faction) then

-		if (Faction == 1) then
+		if (Faction == 0) then
+
+			DB[ID]["Faction"] = BFAC["Neutral"]
+
+		elseif (Faction == 1) then

 			DB[ID]["Faction"] = BFAC["Alliance"]

@@ -593,10 +597,6 @@ function addon:addLookupList(DB, ID, Name, Loc, Coordx, Coordy, Faction)

 			DB[ID]["Faction"] = BFAC["Horde"]

-		elseif (Faction == 3) then
-
-			DB[ID]["Faction"] = BFAC["Neutral"]
-
 		end

 	end
diff --git a/AckisRecipeList.toc b/AckisRecipeList.toc
index 37ff2ef..270664b 100644
--- a/AckisRecipeList.toc
+++ b/AckisRecipeList.toc
@@ -18,7 +18,7 @@
 ## X-Donate: Donate a few bucks/hours at your local animal shelter, or send me UDE Point codes, a Murky Code, or an account upgrade certificate.

 ## Interface: 30000
-## Version: Beta 5 r921
+## Version: Beta 5 r935
 ## X-Revision: $Rev$
 ## X-Date: $Date$

@@ -36,7 +36,7 @@

 ## SavedVariables: ARLDB2

-# Libraries
+# Libraries
 embeds.xml

 # Localization files
diff --git a/RecipeDB/ARL-Alchemy.lua b/RecipeDB/ARL-Alchemy.lua
index 475fd90..fa0c091 100644
--- a/RecipeDB/ARL-Alchemy.lua
+++ b/RecipeDB/ARL-Alchemy.lua
@@ -781,7 +781,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17559, 6, 529, 2, 10856, 6, 529, 2, 10857, 6, 529, 2, 11536)

 	-- Transmute: Fire to Earth -- 17560
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -875,11 +875,11 @@ function addon:InitAlchemy(RecipeDB)

 	-- Greater Arcane Elixir -- 17573
 	-- Trainer
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
-	-- Instance: 1477 - type1minlevel50category3maxlevel55nameThe Temple of Atal'Hakkarterritory1id1477
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
+	-- Instance: 1477 - type1territory1minlevel50category3nameThe Temple of Atal'Hakkarmaxlevel55id1477
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -889,8 +889,8 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17573, 3, 5717, 3, 9197, 3, 10318, 3, 10412, 3, 11480, 1, 1386, 1, 7948, 1, 16588, 1, 18802, 1, 19052)

 	-- Greater Fire Protection Potion -- 17574
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -945,7 +945,7 @@ function addon:InitAlchemy(RecipeDB)
 	-- No acquire information

 	-- Major Mana Potion -- 17580
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Mob Drop
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
@@ -976,7 +976,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17634, 7, 2)

 	-- Flask of the Titans -- 17635
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -986,7 +986,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17635, 3, 10363)

 	-- Flask of Distilled Wisdom -- 17636
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -996,7 +996,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17636, 3, 10813)

 	-- Flask of Supreme Power -- 17637
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1006,7 +1006,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 17637, 3, 10508)

 	-- Flask of Chromatic Resistance -- 17638
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1109,7 +1109,7 @@ function addon:InitAlchemy(RecipeDB)

 	-- Transmute: Elemental Fire -- 25146
 	-- Thorium Brotherhood - Friendly
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1343,8 +1343,8 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 28570, 7, 2)

 	-- Major Fire Protection Potion -- 28571
-	-- Instance: 3849 - expansion1type5minlevel70category3nameTempest Keep: The Mechanarterritory1id3849
-	-- Instance: 3849 - expansion1type5minlevel70category3nameTempest Keep: The Mechanarterritory1id3849
+	-- Instance: 3849 - type5territory1expansion1minlevel70category3nameTempest Keep: The Mechanarid3849
+	-- Instance: 3849 - type5territory1expansion1minlevel70category3nameTempest Keep: The Mechanarid3849
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1354,7 +1354,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 28571, 3, 19168, 3, 19221)

 	-- Major Frost Protection Potion -- 28572
-	-- Instance: 3792 - expansion1type5minlevel64category3maxlevel66nameAuchindoun: Mana-Tombsterritory1id3792
+	-- Instance: 3792 - type5territory1expansion1minlevel64category3nameAuchindoun: Mana-Tombsmaxlevel66id3792
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1410,7 +1410,7 @@ function addon:InitAlchemy(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 28578, 7, 2)

 	-- Ironshield Potion -- 28579
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
diff --git a/RecipeDB/ARL-BlackSmith.lua b/RecipeDB/ARL-BlackSmith.lua
index 88614ca..b69a9d6 100644
--- a/RecipeDB/ARL-BlackSmith.lua
+++ b/RecipeDB/ARL-BlackSmith.lua
@@ -661,7 +661,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 3513, 7, 2)

 	-- Golden Scale Boots -- 3515
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Mail,
 	-- Item Stats:
@@ -1330,7 +1330,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 14380, 1, 2836, 1, 3355, 1, 4258, 1, 16583, 1, 16669, 1, 16823, 1, 19341)

 	-- Dark Iron Pulverizer -- 15292
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Mace,
 	-- Item Stats:
@@ -1341,12 +1341,12 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 15292, 3, 9028)

 	-- Dark Iron Mail -- 15293
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -1357,8 +1357,8 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 15293, 3, 8900, 3, 8901, 3, 8907, 3, 8911, 3, 8920, 3, 8983)

 	-- Dark Iron Sunderer -- 15294
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Axe,
 	-- Item Stats:
@@ -1369,9 +1369,9 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 15294, 3, 9554, 3, 10043)

 	-- Dark Iron Shoulders -- 15295
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats:
@@ -1382,7 +1382,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 15295, 3, 8891, 3, 8894, 3, 8899)

 	-- Dark Iron Plate -- 15296
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoP, Recipe BoP, Armor, Plate,
 	-- Item Stats:
@@ -1403,12 +1403,12 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 15972, 1, 2836, 1, 3355, 1, 4258, 1, 16583, 1, 16669, 1, 16823, 1, 19341)

 	-- Searing Golden Blade -- 15973
-	-- Instance: 1337 - type1minlevel39category3maxlevel47nameUldamanterritory1id1337
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
-	-- Instance: 1176 - type1minlevel43category3maxlevel47nameZul'Farrakterritory1id1176
-	-- Instance: 1176 - type1minlevel43category3maxlevel47nameZul'Farrakterritory1id1176
+	-- Instance: 1337 - type1territory1minlevel39category3nameUldamanmaxlevel47id1337
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
+	-- Instance: 1176 - type1territory1minlevel43category3nameZul'Farrakmaxlevel47id1176
+	-- Instance: 1176 - type1territory1minlevel43category3nameZul'Farrakmaxlevel47id1176
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Dagger, Armor, Trinket,
 	-- Item Stats:
@@ -1737,7 +1737,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Lionheart Helm -- 16729
 	-- Raid: 2677 - Blackwing Lair
 	-- Raid: 2159 - Onyxia's Lair
-	-- Instance: 3714 - expansion1type5minlevel70category3nameHellfire Citadel: The Shattered Hallsterritory1id3714
+	-- Instance: 3714 - type5territory1expansion1minlevel70category3nameHellfire Citadel: The Shattered Hallsid3714
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Plate,
 	-- Item Stats:
@@ -1779,7 +1779,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Stronghold Gauntlets -- 16741
 	-- Raid: 2717 - Molten Core
 	-- Raid: 2159 - Onyxia's Lair
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Raid: 3428 - Ahn'Qiraj
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Plate,
@@ -1822,9 +1822,9 @@ function addon:InitBlacksmithing(RecipeDB)

 	-- Invulnerable Mail -- 16746
 	-- Raid: 2677 - Blackwing Lair
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Raid: 2159 - Onyxia's Lair
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Raid: 1977 - Zul'Gurub
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Mail,
@@ -1974,7 +1974,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- No acquire information

 	-- Hammer of the Titans -- 16988
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Mace,
 	-- Item Stats:
@@ -1985,7 +1985,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 16988, 3, 10438)

 	-- Arcanite Champion -- 16990
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Sword,
 	-- Item Stats:
@@ -1996,7 +1996,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 16990, 3, 10899)

 	-- Annihilator -- 16991
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Axe,
 	-- Item Stats:
@@ -2017,7 +2017,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 16992, 3, 1844)

 	-- Masterwork Stormhammer -- 16993
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Mace,
 	-- Item Stats:
@@ -2028,7 +2028,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 16993, 3, 10899)

 	-- Arcanite Reaper -- 16994
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Axe, Armor, Trinket,
 	-- Item Stats:
@@ -2039,7 +2039,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 16994, 3, 9596)

 	-- Heartseeker -- 16995
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Dagger, Armor, Trinket,
 	-- Item Stats:
@@ -2096,7 +2096,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20201, 1, 2836, 1, 16583, 1, 16823, 1, 19341)

 	-- Fiery Chain Girdle -- 20872
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -2107,7 +2107,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20872, 2, 12944)

 	-- Fiery Chain Shoulders -- 20873
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -2118,7 +2118,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20873, 2, 12944)

 	-- Dark Iron Bracers -- 20874
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats:
@@ -2129,7 +2129,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20874, 2, 12944)

 	-- Dark Iron Leggings -- 20876
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats:
@@ -2140,7 +2140,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20876, 2, 12944)

 	-- Dark Iron Reaver -- 20890
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Weapon, Sword,
 	-- Item Stats:
@@ -2151,7 +2151,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20890, 2, 12944)

 	-- Dark Iron Destroyer -- 20897
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Weapon, Axe,
 	-- Item Stats:
@@ -2242,7 +2242,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23633, 6, 529, 3, 10856, 6, 529, 3, 10857, 6, 529, 3, 11536)

 	-- Dark Iron Helm -- 23636
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats:
@@ -2253,7 +2253,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23636, 2, 12944)

 	-- Dark Iron Gauntlets -- 23637
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats:
@@ -2264,7 +2264,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23637, 2, 12944)

 	-- Black Amnesty -- 23638
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Weapon, Dagger,
 	-- Item Stats:
@@ -2275,7 +2275,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23638, 2, 12944)

 	-- Blackfury -- 23639
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Weapon, Polearm, Armor, Trinket,
 	-- Item Stats:
@@ -2492,7 +2492,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Titanic Leggings -- 27829
 	-- Raid: 2677 - Blackwing Lair
 	-- Raid: 2159 - Onyxia's Lair
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Plate,
 	-- Item Stats:
@@ -2865,7 +2865,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 29617, 6, 932, 3, 19321)

 	-- Felsteel Gloves -- 29619
-	-- Instance: 3790 - expansion1type5minlevel65category3maxlevel67nameAuchindoun: Auchenai Cryptsterritory1id3790
+	-- Instance: 3790 - type5territory1expansion1minlevel65category3nameAuchindoun: Auchenai Cryptsmaxlevel67id3790
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats: Tanking,
@@ -2876,7 +2876,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 29619, 3, 18497)

 	-- Felsteel Leggings -- 29620
-	-- Instance: 3848 - expansion1type5minlevel70category3nameTempest Keep: The Arcatrazterritory1id3848
+	-- Instance: 3848 - type5territory1expansion1minlevel70category3nameTempest Keep: The Arcatrazid3848
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats: Tanking,
@@ -2887,7 +2887,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 29620, 3, 20900)

 	-- Felsteel Helm -- 29621
-	-- Instance: 3789 - expansion1type5minlevel70category3nameAuchindoun: Shadow Labrynthterritory1id3789
+	-- Instance: 3789 - type5territory1expansion1minlevel70category3nameAuchindoun: Shadow Labrynthid3789
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Plate,
 	-- Item Stats: Tanking,
@@ -2968,7 +2968,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 29645, 3, 21454, 3, 23305, 3, 23324)

 	-- Swiftsteel Gloves -- 29648
-	-- Instance: 3792 - expansion1type5minlevel64category3maxlevel66nameAuchindoun: Mana-Tombsterritory1id3792
+	-- Instance: 3792 - type5territory1expansion1minlevel64category3nameAuchindoun: Mana-Tombsmaxlevel66id3792
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -2979,7 +2979,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 29648, 3, 18314)

 	-- Earthpeace Breastplate -- 29649
-	-- Instance: 3847 - expansion1type5minlevel70category3nameTempest Keep: The Botanicaterritory1id3847
+	-- Instance: 3847 - type5territory1expansion1minlevel70category3nameTempest Keep: The Botanicaid3847
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats: Healing,
@@ -3103,7 +3103,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	-- Raid: 3607 - Coilfang Reservoir: Serpentshrine Cavern
 	-- Raid: 3457 - Karazhan
 	-- Raid: 3457 - Karazhan
-	-- Instance: 3848 - expansion1type5minlevel70category3nameTempest Keep: The Arcatrazterritory1id3848
+	-- Instance: 3848 - type5territory1expansion1minlevel70category3nameTempest Keep: The Arcatrazid3848
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Sword,
 	-- Item Stats:
@@ -3190,8 +3190,8 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 29699, 3, 16409, 3, 16460, 3, 16595, 3, 18554, 3, 21229, 3, 22254, 3, 22384)

 	-- Hand of Eternity -- 29700
-	-- Instance: 3717 - expansion1type5minlevel62category3maxlevel64nameCoilfang Reservoir: The Slave Pensterritory1id3717
-	-- Instance: 3847 - expansion1type5minlevel70category3nameTempest Keep: The Botanicaterritory1id3847
+	-- Instance: 3717 - type5territory1expansion1minlevel62category3nameCoilfang Reservoir: The Slave Pensmaxlevel64id3717
+	-- Instance: 3847 - type5territory1expansion1minlevel70category3nameTempest Keep: The Botanicaid3847
 	-- Raid: 3457 - Karazhan
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Mace, Armor, Trinket,
@@ -3230,7 +3230,7 @@ function addon:InitBlacksmithing(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 32284, 1, 16583, 1, 16823, 1, 19341)

 	-- Greater Rune of Warding -- 32285
-	-- Instance: 3714 - expansion1type5minlevel70category3nameHellfire Citadel: The Shattered Hallsterritory1id3714
+	-- Instance: 3714 - type5territory1expansion1minlevel70category3nameHellfire Citadel: The Shattered Hallsid3714
 	-- Mob Drop
 	-- Cenarion Expedition - Honored
 	-- Vendor
@@ -3946,7 +3946,7 @@ function addon:InitBlacksmithing(RecipeDB)

 	-- Adamantite Weapon Chain -- 42688
 	-- Raid: 3959 - Black Temple
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Raid: 3457 - Karazhan
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
@@ -3968,10 +3968,10 @@ function addon:InitBlacksmithing(RecipeDB)

 	-- Hammer of Righteous Might -- 43846
 	-- Raid: 3457 - Karazhan
-	-- Instance: 3791 - expansion1type5minlevel67category3maxlevel69nameAuchindoun: Sethekk Hallsterritory1id3791
+	-- Instance: 3791 - type5territory1expansion1minlevel67category3nameAuchindoun: Sethekk Hallsmaxlevel69id3791
 	-- Raid: 3457 - Karazhan
 	-- Raid: 3457 - Karazhan
-	-- Instance: 3849 - expansion1type5minlevel70category3nameTempest Keep: The Mechanarterritory1id3849
+	-- Instance: 3849 - type5territory1expansion1minlevel70category3nameTempest Keep: The Mechanarid3849
 	-- Raid: 3457 - Karazhan
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Mace, Armor, Trinket,
diff --git a/RecipeDB/ARL-Cook.lua b/RecipeDB/ARL-Cook.lua
index fe9c00a..b1e2400 100644
--- a/RecipeDB/ARL-Cook.lua
+++ b/RecipeDB/ARL-Cook.lua
@@ -739,7 +739,7 @@ function addon:InitCooking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22480, 2, 4782, 2, 7733, 2, 8125)

 	-- Runn Tum Tuber Surprise -- 22761
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1058,7 +1058,7 @@ function addon:InitCooking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 43761, 3, 18940, 3, 18962, 3, 24393)

 	-- Spicy Hot Talbuk -- 43765
-	-- Instance: 3716 - expansion1type5minlevel63category3maxlevel65nameCoilfang Reservoir: The Underbogterritory1id3716
+	-- Instance: 3716 - type5territory1expansion1minlevel63category3nameCoilfang Reservoir: The Underbogmaxlevel65id3716
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
diff --git a/RecipeDB/ARL-Enchant.lua b/RecipeDB/ARL-Enchant.lua
index 1628140..4f90e0a 100644
--- a/RecipeDB/ARL-Enchant.lua
+++ b/RecipeDB/ARL-Enchant.lua
@@ -249,7 +249,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 7863, 1, 1317, 1, 3011, 1, 3345, 1, 4213, 1, 4616, 1, 5157, 1, 7949, 1, 11072, 1, 11073, 1, 11074, 1, 16633, 1, 16725, 1, 19249, 1, 19250, 1, 19251)

 	-- Enchant Boots - Minor Agility -- 7867
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -567,9 +567,9 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 13687, 7, 2)

 	-- Enchant Shield - Lesser Block -- 13689
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
-	-- Instance: 722 - type1minlevel33category3maxlevel40nameRazorfen Downsterritory4id722
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
+	-- Instance: 722 - type1territory4minlevel33category3nameRazorfen Downsmaxlevel40id722
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -742,7 +742,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 13890, 1, 11072, 1, 11073, 1, 11074, 1, 19250, 1, 19251)

 	-- Enchant Weapon - Fiery Weapon -- 13898
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -909,7 +909,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 14810, 1, 11072, 1, 11073, 1, 11074, 1, 19250, 1, 19251)

 	-- Smoking Heart of the Mountain -- 15596
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoP, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
@@ -986,7 +986,7 @@ function addon:InitEnchanting(RecipeDB)

 	-- Enchant Gloves - Greater Strength -- 20013
 	-- Trainer
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -997,7 +997,7 @@ function addon:InitEnchanting(RecipeDB)

 	-- Enchant Cloak - Greater Resistance -- 20014
 	-- Trainer
-	-- Instance: 1477 - type1minlevel50category3maxlevel55nameThe Temple of Atal'Hakkarterritory1id1477
+	-- Instance: 1477 - type1territory1minlevel50category3nameThe Temple of Atal'Hakkarmaxlevel55id1477
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Trinket,
 	-- Item Stats:
@@ -1091,7 +1091,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20029, 3, 7524)

 	-- Enchant 2H Weapon - Superior Impact -- 20030
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1101,7 +1101,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20030, 3, 10317)

 	-- Enchant Weapon - Superior Striking -- 20031
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1111,7 +1111,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20031, 3, 9216)

 	-- Enchant Weapon - Lifestealing -- 20032
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1121,7 +1121,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20032, 3, 10499)

 	-- Enchant Weapon - Unholy Weapon -- 20033
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1140,7 +1140,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20034, 3, 4494, 3, 9451)

 	-- Enchant 2H Weapon - Major Spirit -- 20035
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1150,7 +1150,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20035, 3, 10469)

 	-- Enchant 2H Weapon - Major Intellect -- 20036
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1219,7 +1219,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22750, 3, 11982, 3, 11988, 3, 12056, 3, 12057, 3, 12118, 3, 12259, 3, 12264)

 	-- Enchant Weapon - Strength -- 23799
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1259,7 +1259,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23802, 6, 529, 3, 10856, 6, 529, 3, 10857, 6, 529, 3, 11536)

 	-- Enchant Weapon - Mighty Spirit -- 23803
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1269,7 +1269,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23803, 2, 12944)

 	-- Enchant Weapon - Mighty Intellect -- 23804
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1509,7 +1509,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27913, 7, 2)

 	-- Enchant Bracer - Fortitude -- 27914
-	-- Instance: 3715 - expansion1type5minlevel70category3nameCoilfang Reservoir: The Steamvaultterritory1id3715
+	-- Instance: 3715 - type5territory1expansion1minlevel70category3nameCoilfang Reservoir: The Steamvaultid3715
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1578,7 +1578,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27944, 1, 18753, 1, 18773, 1, 19252, 1, 19540)

 	-- Enchant Shield - Intellect -- 27945
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1615,7 +1615,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27948, 7, 2)

 	-- Enchant Boots - Fortitude -- 27950
-	-- Instance: 3792 - expansion1type5minlevel64category3maxlevel66nameAuchindoun: Mana-Tombsterritory1id3792
+	-- Instance: 3792 - type5territory1expansion1minlevel64category3nameAuchindoun: Mana-Tombsmaxlevel66id3792
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1625,7 +1625,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27950, 3, 18317)

 	-- Enchant Boots - Dexterity -- 27951
-	-- Instance: 3790 - expansion1type5minlevel65category3maxlevel67nameAuchindoun: Auchenai Cryptsterritory1id3790
+	-- Instance: 3790 - type5territory1expansion1minlevel65category3nameAuchindoun: Auchenai Cryptsmaxlevel67id3790
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1710,7 +1710,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27968, 3, 20136)

 	-- Enchant 2H Weapon - Savagery -- 27971
-	-- Instance: 3714 - expansion1type5minlevel70category3nameHellfire Citadel: The Shattered Hallsterritory1id3714
+	-- Instance: 3714 - type5territory1expansion1minlevel70category3nameHellfire Citadel: The Shattered Hallsid3714
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -1738,7 +1738,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27975, 3, 20614, 3, 22242, 3, 22243)

 	-- Enchant 2H Weapon - Major Agility -- 27977
-	-- Instance: 3848 - expansion1type5minlevel70category3nameTempest Keep: The Arcatrazterritory1id3848
+	-- Instance: 3848 - type5territory1expansion1minlevel70category3nameTempest Keep: The Arcatrazid3848
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP,
 	-- Item Stats:
@@ -2582,7 +2582,7 @@ function addon:InitEnchanting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 46594, 6, 1077, 2, 25032)

 	-- Enchant Cloak - Steelweave -- 47051
-	-- Instance: 4095 - expansion1type1minlevel70limit5category3maxlevel70nameMagisters' Terraceterritory1id4095
+	-- Instance: 4095 - type1territory1expansion1minlevel70limit5category3nameMagisters' Terracemaxlevel70id4095
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
diff --git a/RecipeDB/ARL-Engineer.lua b/RecipeDB/ARL-Engineer.lua
index 0c3c480..45965d6 100644
--- a/RecipeDB/ARL-Engineer.lua
+++ b/RecipeDB/ARL-Engineer.lua
@@ -245,7 +245,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 3942, 1, 1676, 1, 3412, 1, 5174, 1, 5518, 1, 8736, 1, 11017, 1, 11029, 1, 11031, 1, 16667, 1, 16726, 1, 17634, 1, 17637, 1, 18752, 1, 18775, 1, 19576)

 	-- Flame Deflector -- 3944
-	-- Instance: 721 - type1minlevel24category3maxlevel33nameGnomereganterritory2id721
+	-- Instance: 721 - type1territory2minlevel24category3nameGnomereganmaxlevel33id721
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -302,7 +302,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 3950, 1, 1676, 1, 3412, 1, 5174, 1, 5518, 1, 8736, 1, 11017, 1, 11029, 1, 11031, 1, 16667, 1, 16726, 1, 17634, 1, 17637, 1, 18752, 1, 18775, 1, 19576)

 	-- Minor Recombobulator -- 3952
-	-- Instance: 721 - type1minlevel24category3maxlevel33nameGnomereganterritory2id721
+	-- Instance: 721 - type1territory2minlevel24category3nameGnomereganmaxlevel33id721
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Trinket,
 	-- Item Stats:
@@ -368,7 +368,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 3958, 1, 5174, 1, 8736, 1, 11017, 1, 17634, 1, 17637, 1, 18752, 1, 18775, 1, 19576)

 	-- Discombobulator Ray -- 3959
-	-- Instance: 721 - type1minlevel24category3maxlevel33nameGnomereganterritory2id721
+	-- Instance: 721 - type1territory2minlevel24category3nameGnomereganmaxlevel33id721
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -460,7 +460,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 3969, 2, 2687)

 	-- Gnomish Cloaking Device -- 3971
-	-- Instance: 721 - type1minlevel24category3maxlevel33nameGnomereganterritory2id721
+	-- Instance: 721 - type1territory2minlevel24category3nameGnomereganmaxlevel33id721
 	-- Mob Drop
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Trinket,
@@ -535,7 +535,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 7430, 1, 1702, 1, 2857, 1, 3290, 1, 3412, 1, 3494, 1, 4586, 1, 5174, 1, 5518, 1, 8736, 1, 11017, 1, 11025, 1, 11026, 1, 11028, 1, 11029, 1, 11031, 1, 11037, 1, 16667, 1, 16668, 1, 16726, 1, 16743, 1, 17222, 1, 17634, 1, 17637, 1, 18752, 1, 18775, 1, 19576)

 	-- Flash Bomb -- 8243
-	-- Instance: 721 - type1minlevel24category3maxlevel33nameGnomereganterritory2id721
+	-- Instance: 721 - type1territory2minlevel24category3nameGnomereganmaxlevel33id721
 	-- Mob Drop
 	-- Quest Reward
 	-- Flags: All classes, Item BoE, Recipe BoE,
@@ -574,7 +574,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 8895, 1, 8126)

 	-- Gnomish Universal Remote -- 9269
-	-- Instance: 721 - type1minlevel24category3maxlevel33nameGnomereganterritory2id721
+	-- Instance: 721 - type1territory2minlevel24category3nameGnomereganmaxlevel33id721
 	-- Mob Drop
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Trinket,
@@ -594,9 +594,9 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 9271, 1, 1676, 1, 3412, 1, 5174, 1, 5518, 1, 8736, 1, 11017, 1, 11029, 1, 11031, 1, 16667, 1, 16726, 1, 17634, 1, 17637, 1, 18752, 1, 18775, 1, 19576)

 	-- Goblin Jumper Cables -- 9273
-	-- Instance: 721 - type1minlevel24category3maxlevel33nameGnomereganterritory2id721
+	-- Instance: 721 - type1territory2minlevel24category3nameGnomereganmaxlevel33id721
 	-- Mob Drop
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -749,10 +749,10 @@ function addon:InitEngineering(RecipeDB)

 	-- Spellpower Goggles Xtreme -- 12615
 	-- Trainer
-	-- Instance: 2100 - type1minlevel43category3maxlevel49nameMaraudonterritory1id2100
+	-- Instance: 2100 - type1territory1minlevel43category3nameMaraudonmaxlevel49id2100
 	-- Raid: 2677 - Blackwing Lair
 	-- Raid: 2159 - Onyxia's Lair
-	-- Instance: 2100 - type1minlevel43category3maxlevel49nameMaraudonterritory1id2100
+	-- Instance: 2100 - type1territory1minlevel43category3nameMaraudonmaxlevel49id2100
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloth,
 	-- Item Stats: Caster DPS,
@@ -1168,7 +1168,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19795, 1, 8736, 1, 17634, 1, 17637, 1, 18752, 1, 18775, 1, 19576)

 	-- Dark Iron Rifle -- 19796
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Weapon, Gun, Armor, Trinket,
 	-- Item Stats:
@@ -1179,7 +1179,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19796, 3, 8897, 3, 9026)

 	-- Dark Iron Bomb -- 19799
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1218,7 +1218,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19815, 2, 11185)

 	-- Voice Amplification Modulator -- 19819
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Amulet,
 	-- Item Stats:
@@ -1229,7 +1229,7 @@ function addon:InitEngineering(RecipeDB)

 	-- Master Engineer's Goggles -- 19825
 	-- Trainer
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloth,
 	-- Item Stats:
@@ -1399,7 +1399,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23077, 2, 11185)

 	-- Goblin Jumper Cables XL -- 23078
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1427,7 +1427,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23080, 2, 11185)

 	-- Hyper-Radiant Flame Reflector -- 23081
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Trinket,
 	-- Item Stats:
@@ -1438,7 +1438,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23081, 3, 10264)

 	-- Ultra-Flash Shadow Reflector -- 23082
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Trinket,
 	-- Item Stats:
@@ -1449,7 +1449,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23082, 3, 10426)

 	-- Alarm-O-Bot -- 23096
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1460,7 +1460,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23096, 3, 8920)

 	-- World Enlarger -- 23129
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1986,7 +1986,7 @@ function addon:InitEngineering(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 30552, 7, 3)

 	-- Rocket Boots Xtreme -- 30556
-	-- Instance: 3715 - expansion1type5minlevel70category3nameCoilfang Reservoir: The Steamvaultterritory1id3715
+	-- Instance: 3715 - type5territory1expansion1minlevel70category3nameCoilfang Reservoir: The Steamvaultid3715
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats:
@@ -2436,7 +2436,7 @@ function addon:InitEngineering(RecipeDB)
 	-- No acquire information

 	-- Rocket Boots Xtreme Lite -- 46697
-	-- Instance: 3849 - expansion1type5minlevel70category3nameTempest Keep: The Mechanarterritory1id3849
+	-- Instance: 3849 - type5territory1expansion1minlevel70category3nameTempest Keep: The Mechanarid3849
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS,
diff --git a/RecipeDB/ARL-Jewelcraft.lua b/RecipeDB/ARL-Jewelcraft.lua
index eda8fce..2e62786 100644
--- a/RecipeDB/ARL-Jewelcraft.lua
+++ b/RecipeDB/ARL-Jewelcraft.lua
@@ -528,7 +528,7 @@ function addon:InitJewelcrafting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 26911, 1, 18751, 1, 18774, 1, 19063, 1, 19539, 1, 19775, 1, 19778)

 	-- Figurine - Black Diamond Crab -- 26912
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoP, Recipe BoP, Armor, Trinket,
 	-- Item Stats: Tanking,
@@ -539,7 +539,7 @@ function addon:InitJewelcrafting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 26912, 3, 9736)

 	-- Figurine - Dark Iron Scorpid -- 26914
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoP, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
@@ -942,7 +942,7 @@ function addon:InitJewelcrafting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31053, 3, 19826)

 	-- Khorium Band of Frost -- 31054
-	-- Instance: 3715 - expansion1type5minlevel70category3nameCoilfang Reservoir: The Steamvaultterritory1id3715
+	-- Instance: 3715 - type5territory1expansion1minlevel70category3nameCoilfang Reservoir: The Steamvaultid3715
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Ring,
 	-- Item Stats:
@@ -953,7 +953,7 @@ function addon:InitJewelcrafting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31054, 3, 17722)

 	-- Khorium Inferno Band -- 31055
-	-- Instance: 3791 - expansion1type5minlevel67category3maxlevel69nameAuchindoun: Sethekk Hallsterritory1id3791
+	-- Instance: 3791 - type5territory1expansion1minlevel67category3nameAuchindoun: Sethekk Hallsmaxlevel69id3791
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Ring,
 	-- Item Stats:
@@ -1128,7 +1128,7 @@ function addon:InitJewelcrafting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31076, 7, 3)

 	-- Coronet of the Verdant Flame -- 31077
-	-- Instance: 3847 - expansion1type5minlevel70category3nameTempest Keep: The Botanicaterritory1id3847
+	-- Instance: 3847 - type5territory1expansion1minlevel70category3nameTempest Keep: The Botanicaid3847
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -1139,7 +1139,7 @@ function addon:InitJewelcrafting(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31077, 3, 18422)

 	-- Circlet of Arcane Might -- 31078
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
diff --git a/RecipeDB/ARL-LeatherWork.lua b/RecipeDB/ARL-LeatherWork.lua
index 1ab0274..179a0ae 100644
--- a/RecipeDB/ARL-LeatherWork.lua
+++ b/RecipeDB/ARL-LeatherWork.lua
@@ -501,7 +501,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 6661, 1, 3007, 1, 4212, 1, 11097, 1, 11098, 1, 18754, 1, 18771, 1, 19187, 1, 21087)

 	-- Murloc Scale Belt -- 6702
-	-- Instance: 1581 - type1minlevel15category3maxlevel20nameThe Deadminesterritory2id1581
+	-- Instance: 1581 - type1territory2minlevel15category3nameThe Deadminesmaxlevel20id1581
 	-- Mob Drop
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
@@ -513,7 +513,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 6702, 3, 1732, 3, 3385, 2, 843, 2, 3556, 2, 4186)

 	-- Murloc Scale Breastplate -- 6703
-	-- Instance: 1581 - type1minlevel15category3maxlevel20nameThe Deadminesterritory2id1581
+	-- Instance: 1581 - type1territory2minlevel15category3nameThe Deadminesmaxlevel20id1581
 	-- Mob Drop
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
@@ -627,7 +627,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 7156, 1, 3007, 1, 4212, 1, 11097, 1, 11098, 1, 18754, 1, 18771, 1, 19187, 1, 21087)

 	-- Deviate Scale Cloak -- 7953
-	-- Instance: 718 - type1minlevel15category3maxlevel21nameWailing Cavernsterritory4id718
+	-- Instance: 718 - type1territory4minlevel15category3nameWailing Cavernsmaxlevel21id718
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloak,
 	-- Item Stats:
@@ -638,7 +638,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 7953, 2, 5783)

 	-- Deviate Scale Gloves -- 7954
-	-- Instance: 718 - type1minlevel15category3maxlevel21nameWailing Cavernsterritory4id718
+	-- Instance: 718 - type1territory4minlevel15category3nameWailing Cavernsmaxlevel21id718
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -787,7 +787,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 9146, 2, 6731)

 	-- Earthen Leather Shoulders -- 9147
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -906,8 +906,8 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 9206, 1, 3007, 1, 4212, 1, 11097, 1, 11098, 1, 18754, 1, 18771, 1, 19187, 1, 21087)

 	-- Dusky Boots -- 9207
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
-	-- Instance: 722 - type1minlevel33category3maxlevel40nameRazorfen Downsterritory4id722
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
+	-- Instance: 722 - type1territory4minlevel33category3nameRazorfen Downsmaxlevel40id722
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -1385,7 +1385,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19053, 2, 12957)

 	-- Red Dragonscale Breastplate -- 19054
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats: Healing,
@@ -1426,7 +1426,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19059, 3, 7035)

 	-- Green Dragonscale Leggings -- 19060
-	-- Instance: 1477 - type1minlevel50category3maxlevel55nameThe Temple of Atal'Hakkarterritory1id1477
+	-- Instance: 1477 - type1territory1minlevel50category3nameThe Temple of Atal'Hakkarmaxlevel55id1477
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Mail,
 	-- Item Stats:
@@ -1580,7 +1580,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19075, 3, 7027)

 	-- Volcanic Breastplate -- 19076
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -1672,7 +1672,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19084, 2, 12959)

 	-- Black Dragonscale Breastplate -- 19085
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Mail,
 	-- Item Stats:
@@ -1745,7 +1745,7 @@ function addon:InitLeatherworking(RecipeDB)

 	-- Wicked Leather Belt -- 19092
 	-- Trainer
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -1766,7 +1766,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- No acquire information

 	-- Black Dragonscale Shoulders -- 19094
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Mail,
 	-- Item Stats:
@@ -1798,7 +1798,7 @@ function addon:InitLeatherworking(RecipeDB)

 	-- Wicked Leather Armor -- 19098
 	-- Trainer
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -1819,7 +1819,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 19100, 3, 7029)

 	-- Volcanic Shoulders -- 19101
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -1831,7 +1831,7 @@ function addon:InitLeatherworking(RecipeDB)

 	-- Runic Leather Armor -- 19102
 	-- Trainer
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -1843,7 +1843,7 @@ function addon:InitLeatherworking(RecipeDB)

 	-- Runic Leather Shoulders -- 19103
 	-- Trainer
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Leather,
 	-- Item Stats:
@@ -1874,7 +1874,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- No acquire information

 	-- Black Dragonscale Leggings -- 19107
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Mail,
 	-- Item Stats:
@@ -1912,7 +1912,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20650, 1, 3007, 1, 4212, 1, 11097, 1, 11098, 1, 18754, 1, 18771, 1, 19187, 1, 21087)

 	-- Corehound Boots -- 20853
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats:
@@ -1923,7 +1923,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20853, 2, 12944)

 	-- Molten Helm -- 20854
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats: Tanking,
@@ -1934,7 +1934,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20854, 2, 12944)

 	-- Black Dragonscale Boots -- 20855
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -1998,7 +1998,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- No acquire information

 	-- Girdle of Insight -- 22921
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats:
@@ -2009,7 +2009,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22921, 3, 14338)

 	-- Mongoose Boots -- 22922
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats:
@@ -2020,7 +2020,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22922, 3, 14338)

 	-- Swift Flight Bracers -- 22923
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -2031,7 +2031,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22923, 3, 14338)

 	-- Chromatic Cloak -- 22926
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloak,
 	-- Item Stats:
@@ -2051,7 +2051,7 @@ function addon:InitLeatherworking(RecipeDB)
 	-- No acquire information

 	-- Shifting Cloak -- 22928
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloak,
 	-- Item Stats: Tanking,
@@ -2125,7 +2125,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23706, 6, 529, 3, 10856, 6, 529, 3, 10857, 6, 529, 3, 11536)

 	-- Lava Belt -- 23707
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats:
@@ -2136,7 +2136,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23707, 2, 12944)

 	-- Chromatic Gauntlets -- 23708
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -2147,7 +2147,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23708, 2, 12944)

 	-- Corehound Belt -- 23709
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats: Healing,
@@ -2158,7 +2158,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23709, 2, 12944)

 	-- Molten Belt -- 23710
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats:
@@ -2481,7 +2481,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 32458, 6, 934, 3, 19331)

 	-- Riding Crop -- 32461
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Trinket,
 	-- Item Stats:
@@ -2660,8 +2660,8 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 32482, 2, 16689, 2, 16748)

 	-- Stylin' Purple Hat -- 32485
-	-- Instance: 3789 - expansion1type5minlevel70category3nameAuchindoun: Shadow Labrynthterritory1id3789
-	-- Instance: 3789 - expansion1type5minlevel70category3nameAuchindoun: Shadow Labrynthterritory1id3789
+	-- Instance: 3789 - type5territory1expansion1minlevel70category3nameAuchindoun: Shadow Labrynthid3789
+	-- Instance: 3789 - type5territory1expansion1minlevel70category3nameAuchindoun: Shadow Labrynthid3789
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats:
@@ -2672,7 +2672,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 32485, 3, 18667, 3, 19304)

 	-- Stylin' Adventure Hat -- 32487
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats: Caster DPS,
@@ -2683,7 +2683,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 32487, 3, 17820)

 	-- Stylin' Crimson Hat -- 32488
-	-- Instance: 3791 - expansion1type5minlevel67category3maxlevel69nameAuchindoun: Sethekk Hallsterritory1id3791
+	-- Instance: 3791 - type5territory1expansion1minlevel67category3nameAuchindoun: Sethekk Hallsmaxlevel69id3791
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Mail,
 	-- Item Stats:
@@ -2694,10 +2694,10 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 32488, 3, 18322)

 	-- Stylin' Jungle Hat -- 32489
-	-- Instance: 2366 - expansion1type5minlevel70category3nameThe Caverns of Time: The Black Morassterritory1id2366
-	-- Instance: 2366 - expansion1type5minlevel70category3nameThe Caverns of Time: The Black Morassterritory1id2366
-	-- Instance: 2366 - expansion1type5minlevel70category3nameThe Caverns of Time: The Black Morassterritory1id2366
-	-- Instance: 2366 - expansion1type5minlevel70category3nameThe Caverns of Time: The Black Morassterritory1id2366
+	-- Instance: 2366 - type5territory1expansion1minlevel70category3nameThe Caverns of Time: The Black Morassid2366
+	-- Instance: 2366 - type5territory1expansion1minlevel70category3nameThe Caverns of Time: The Black Morassid2366
+	-- Instance: 2366 - type5territory1expansion1minlevel70category3nameThe Caverns of Time: The Black Morassid2366
+	-- Instance: 2366 - type5territory1expansion1minlevel70category3nameThe Caverns of Time: The Black Morassid2366
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Leather,
 	-- Item Stats: Caster DPS,
@@ -2840,7 +2840,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 32503, 6, 941, 3, 20241)

 	-- Shadow Armor Kit -- 35520
-	-- Instance: 3791 - expansion1type5minlevel67category3maxlevel69nameAuchindoun: Sethekk Hallsterritory1id3791
+	-- Instance: 3791 - type5territory1expansion1minlevel67category3nameAuchindoun: Sethekk Hallsmaxlevel69id3791
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
@@ -2850,7 +2850,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 35520, 3, 18320)

 	-- Flame Armor Kit -- 35521
-	-- Instance: 3848 - expansion1type5minlevel70category3nameTempest Keep: The Arcatrazterritory1id3848
+	-- Instance: 3848 - type5territory1expansion1minlevel70category3nameTempest Keep: The Arcatrazid3848
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
@@ -2860,7 +2860,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 35521, 3, 20898)

 	-- Frost Armor Kit -- 35522
-	-- Instance: 3715 - expansion1type5minlevel70category3nameCoilfang Reservoir: The Steamvaultterritory1id3715
+	-- Instance: 3715 - type5territory1expansion1minlevel70category3nameCoilfang Reservoir: The Steamvaultid3715
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
@@ -2870,7 +2870,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 35522, 3, 17797)

 	-- Nature Armor Kit -- 35523
-	-- Instance: 3717 - expansion1type5minlevel62category3maxlevel64nameCoilfang Reservoir: The Slave Pensterritory1id3717
+	-- Instance: 3717 - type5territory1expansion1minlevel62category3nameCoilfang Reservoir: The Slave Pensmaxlevel64id3717
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
@@ -2880,7 +2880,7 @@ function addon:InitLeatherworking(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 35523, 3, 17941)

 	-- Arcane Armor Kit -- 35524
-	-- Instance: 2366 - expansion1type5minlevel70category3nameThe Caverns of Time: The Black Morassterritory1id2366
+	-- Instance: 2366 - type5territory1expansion1minlevel70category3nameThe Caverns of Time: The Black Morassid2366
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Trinket,
 	-- Item Stats:
diff --git a/RecipeDB/ARL-Tailor.lua b/RecipeDB/ARL-Tailor.lua
index 107fe01..0e6a4ae 100644
--- a/RecipeDB/ARL-Tailor.lua
+++ b/RecipeDB/ARL-Tailor.lua
@@ -466,10 +466,10 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 3863, 7, 2)

 	-- Star Belt -- 3864
-	-- Instance: 1176 - type1minlevel43category3maxlevel47nameZul'Farrakterritory1id1176
-	-- Instance: 796 - type1minlevel34category3maxlevel45nameScarlet Monasteryterritory4id796
-	-- Instance: 1337 - type1minlevel39category3maxlevel47nameUldamanterritory1id1337
-	-- Instance: 1337 - type1minlevel39category3maxlevel47nameUldamanterritory1id1337
+	-- Instance: 1176 - type1territory1minlevel43category3nameZul'Farrakmaxlevel47id1176
+	-- Instance: 796 - type1territory4minlevel34category3nameScarlet Monasterymaxlevel45id796
+	-- Instance: 1337 - type1territory1minlevel39category3nameUldamanmaxlevel47id1337
+	-- Instance: 1337 - type1territory1minlevel39category3nameUldamanmaxlevel47id1337
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloth,
 	-- Item Stats: Caster DPS,
@@ -582,7 +582,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 6521, 1, 1346, 1, 2399, 1, 2627, 1, 3004, 1, 3363, 1, 3704, 1, 4159, 1, 4576, 1, 5153, 1, 5567, 1, 11049, 1, 11052, 1, 11557, 1, 16640, 1, 16729, 1, 17487, 1, 18749, 1, 18772)

 	-- Red Linen Bag -- 6686
-	-- Instance: 1581 - type1minlevel15category3maxlevel20nameThe Deadminesterritory2id1581
+	-- Instance: 1581 - type1territory2minlevel15category3nameThe Deadminesmaxlevel20id1581
 	-- Mob Drop
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE,
@@ -594,7 +594,7 @@ function addon:InitTailoring(RecipeDB)

 	-- Red Woolen Bag -- 6688
 	-- Mob Drop
-	-- Instance: 2367 - expansion1type5minlevel66category3maxlevel68nameCaverns of Time: Old Hillsbrad Foothillsterritory1id2367
+	-- Instance: 2367 - type5territory1expansion1minlevel66category3nameCaverns of Time: Old Hillsbrad Foothillsmaxlevel68id2367
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1659,7 +1659,7 @@ function addon:InitTailoring(RecipeDB)

 	-- Wizardweave Leggings -- 18421
 	-- Trainer
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloth,
 	-- Item Stats:
@@ -1765,7 +1765,7 @@ function addon:InitTailoring(RecipeDB)

 	-- Ghostweave Pants -- 18441
 	-- Trainer
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloth,
 	-- Item Stats:
@@ -1894,7 +1894,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 18453, 7, 2, 1, 2399, 1, 11052, 1, 18749, 1, 18772)

 	-- Gloves of Spell Mastery -- 18454
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Raid: 3429 - Ruins of Ahn'Qiraj
 	-- Raid: 2717 - Molten Core
 	-- Raid: 2159 - Onyxia's Lair
@@ -1908,12 +1908,12 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 18454, 3, 6109, 3, 10184, 3, 10318, 3, 12101, 3, 14888, 3, 14889, 3, 14890, 3, 15325)

 	-- Bottomless Bag -- 18455
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Raid: 1977 - Zul'Gurub
 	-- Raid: 3429 - Ruins of Ahn'Qiraj
 	-- Raid: 2717 - Molten Core
 	-- Raid: 2159 - Onyxia's Lair
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -1923,7 +1923,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 18455, 3, 6109, 3, 8724, 3, 10184, 3, 10372, 3, 10440, 3, 11356, 3, 11658, 3, 15323)

 	-- Truefaith Vestments -- 18456
-	-- Instance: 2017 - type1minlevel58category3maxlevel60nameStratholmeterritory1id2017
+	-- Instance: 2017 - type1territory1minlevel58category3nameStratholmemaxlevel60id2017
 	-- Mob Drop
 	-- Flags: Priest, Item BoP, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Healing,
@@ -1934,7 +1934,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 18456, 3, 10813)

 	-- Robe of the Archmage -- 18457
-	-- Instance: 1583 - type1minlevel58category3maxlevel60nameBlackrock Spireterritory1id1583
+	-- Instance: 1583 - type1territory1minlevel58category3nameBlackrock Spiremaxlevel60id1583
 	-- Mob Drop
 	-- Flags: Mage, Item BoP, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS,
@@ -1945,7 +1945,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 18457, 3, 9264)

 	-- Robe of the Void -- 18458
-	-- Instance: 2057 - type1minlevel58category3maxlevel60nameScholomanceterritory1id2057
+	-- Instance: 2057 - type1territory1minlevel58category3nameScholomancemaxlevel60id2057
 	-- Mob Drop
 	-- Flags: Warlock, Item BoP, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS,
@@ -1975,7 +1975,7 @@ function addon:InitTailoring(RecipeDB)
 	-- No acquire information

 	-- Flarecore Mantle -- 20848
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -1986,7 +1986,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 20848, 2, 12944)

 	-- Flarecore Gloves -- 20849
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: Priest, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -2041,7 +2041,7 @@ function addon:InitTailoring(RecipeDB)
 	-- No acquire information

 	-- Felcloth Gloves -- 22867
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -2052,7 +2052,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22867, 3, 14338)

 	-- Inferno Gloves -- 22868
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -2063,7 +2063,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22868, 3, 14338)

 	-- Mooncloth Gloves -- 22869
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -2074,7 +2074,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22869, 3, 14338)

 	-- Cloak of Warding -- 22870
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloak,
 	-- Item Stats: Tanking,
@@ -2085,7 +2085,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 22870, 3, 14338)

 	-- Mooncloth Robe -- 22902
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoE, Armor, Cloth,
 	-- Item Stats:
@@ -2140,7 +2140,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23665, 6, 529, 3, 10856, 6, 529, 3, 10857, 6, 529, 3, 11536)

 	-- Flarecore Robe -- 23666
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS,
@@ -2151,7 +2151,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 23666, 2, 12944)

 	-- Flarecore Leggings -- 23667
-	-- Instance: 1584 - type1minlevel55category3maxlevel60nameBlackrock Depthsterritory1id1584
+	-- Instance: 1584 - type1territory1minlevel55category3nameBlackrock Depthsmaxlevel60id1584
 	-- Vendor
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS,
@@ -2603,7 +2603,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 26781, 3, 16408)

 	-- Arcanoweave Bracers -- 26782
-	-- Instance: 3848 - expansion1type5minlevel70category3nameTempest Keep: The Arcatrazterritory1id3848
+	-- Instance: 3848 - type5territory1expansion1minlevel70category3nameTempest Keep: The Arcatrazid3848
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -2614,7 +2614,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 26782, 3, 20869)

 	-- Arcanoweave Boots -- 26783
-	-- Instance: 3849 - expansion1type5minlevel70category3nameTempest Keep: The Mechanarterritory1id3849
+	-- Instance: 3849 - type5territory1expansion1minlevel70category3nameTempest Keep: The Mechanarid3849
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -2625,7 +2625,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 26783, 3, 19168)

 	-- Arcanoweave Robe -- 26784
-	-- Instance: 3849 - expansion1type5minlevel70category3nameTempest Keep: The Mechanarterritory1id3849
+	-- Instance: 3849 - type5territory1expansion1minlevel70category3nameTempest Keep: The Mechanarid3849
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats:
@@ -2656,7 +2656,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 27659, 2, 15198, 2, 15419)

 	-- Big Bag of Enchantment -- 27660
-	-- Instance: 2557 - type1minlevel58category3maxlevel60nameDire Maulterritory1id2557
+	-- Instance: 2557 - type1territory1minlevel58category3nameDire Maulmaxlevel60id2557
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoE,
 	-- Item Stats:
@@ -2939,7 +2939,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31450, 7, 4)

 	-- Whitemend Pants -- 31451
-	-- Instance: 3848 - expansion1type5minlevel70category3nameTempest Keep: The Arcatrazterritory1id3848
+	-- Instance: 3848 - type5territory1expansion1minlevel70category3nameTempest Keep: The Arcatrazid3848
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Healing,
@@ -2950,7 +2950,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31451, 3, 20885)

 	-- Spellstrike Pants -- 31452
-	-- Instance: 3789 - expansion1type5minlevel70category3nameAuchindoun: Shadow Labrynthterritory1id3789
+	-- Instance: 3789 - type5territory1expansion1minlevel70category3nameAuchindoun: Shadow Labrynthid3789
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS, Caster DPS,
@@ -2961,7 +2961,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31452, 3, 18708)

 	-- Battlecast Pants -- 31453
-	-- Instance: 3847 - expansion1type5minlevel70category3nameTempest Keep: The Botanicaterritory1id3847
+	-- Instance: 3847 - type5territory1expansion1minlevel70category3nameTempest Keep: The Botanicaid3847
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS,
@@ -2972,7 +2972,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31453, 3, 17978)

 	-- Whitemend Hood -- 31454
-	-- Instance: 3847 - expansion1type5minlevel70category3nameTempest Keep: The Botanicaterritory1id3847
+	-- Instance: 3847 - type5territory1expansion1minlevel70category3nameTempest Keep: The Botanicaid3847
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Healing,
@@ -2983,7 +2983,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31454, 3, 17977)

 	-- Spellstrike Hood -- 31455
-	-- Instance: 3714 - expansion1type5minlevel70category3nameHellfire Citadel: The Shattered Hallsterritory1id3714
+	-- Instance: 3714 - type5territory1expansion1minlevel70category3nameHellfire Citadel: The Shattered Hallsid3714
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS, Caster DPS,
@@ -2994,7 +2994,7 @@ function addon:InitTailoring(RecipeDB)
 	self:addTradeAcquire(RecipeDB, 31455, 3, 16807)

 	-- Battlecast Hood -- 31456
-	-- Instance: 3715 - expansion1type5minlevel70category3nameCoilfang Reservoir: The Steamvaultterritory1id3715
+	-- Instance: 3715 - type5territory1expansion1minlevel70category3nameCoilfang Reservoir: The Steamvaultid3715
 	-- Mob Drop
 	-- Flags: All classes, Item BoE, Recipe BoP, Armor, Cloth,
 	-- Item Stats: Caster DPS,
diff --git a/RecipeDB/ARL-Trainer.lua b/RecipeDB/ARL-Trainer.lua
index fd3df59..efba937 100644
--- a/RecipeDB/ARL-Trainer.lua
+++ b/RecipeDB/ARL-Trainer.lua
@@ -222,7 +222,7 @@ function addon:InitTrainer(TrainerDB)
 	self:addLookupList(TrainerDB, 11146, L["Ironus Coldsteel"], BZONE["Ironforge"], 50.59, 43.82, 1)
 	self:addLookupList(TrainerDB, 11177, L["Okothos Ironrager"], BZONE["Orgrimmar"], 79.63, 23.74, 2)
 	self:addLookupList(TrainerDB, 11178, L["Borgosh Corebender"], BZONE["Orgrimmar"], 79.02, 25.01, 2)
-	self:addLookupList(TrainerDB, 11557, L["Meilosh"], BZONE["Felwood"], 63.97, 2.974, 4)
+	self:addLookupList(TrainerDB, 11557, L["Meilosh"], BZONE["Felwood"], 63.97, 2.974, 0)
 	self:addLookupList(TrainerDB, 15400, L["Arathel Sunforge"], BZONE["Eversong Woods"], 59.88, 61.79, 2)
 	self:addLookupList(TrainerDB, 15501, L["Aleinia"], BZONE["Eversong Woods"], 48.33, 47.44, 2)
 	self:addLookupList(TrainerDB, 16160, L["Magistrix Eredania"], BZONE["Eversong Woods"], 38.12, 72.76, 2)
@@ -301,7 +301,7 @@ function addon:InitTrainer(TrainerDB)
 	self:addLookupList(TrainerDB, 19185, L["Jack Trapper"], BZONE["Shattrath City"], 62.41, 67.83, 0)
 	self:addLookupList(TrainerDB, 19186, L["Kylene"], BZONE["Shattrath City"], 74.46, 32.72, 0)
 	self:addLookupList(TrainerDB, 19187, L["Darmari"], BZONE["Shattrath City"], 66.44, 67.29, 0)
-	self:addLookupList(TrainerDB, 19248, L["Enchanter Salias"], BZONE["Shattrath City"], 43.60, 90.07, 4)
+	self:addLookupList(TrainerDB, 19248, L["Enchanter Salias"], BZONE["Shattrath City"], 43.60, 90.07, 0)
 	self:addLookupList(TrainerDB, 19249, L["Enchantress Metura"], BZONE["Shattrath City"], 43.15, 88.85, 0)
 	self:addLookupList(TrainerDB, 19250, L["Enchanter Aeldron"], BZONE["Shattrath City"], 43.21, 88.56, 0)
 	self:addLookupList(TrainerDB, 19251, L["Enchantress Volali"], BZONE["Shattrath City"], 43.01, 91.27, 1)
diff --git a/RecipeDB/ARL-Vendor.lua b/RecipeDB/ARL-Vendor.lua
index d6ab10f..22a0973 100644
--- a/RecipeDB/ARL-Vendor.lua
+++ b/RecipeDB/ARL-Vendor.lua
@@ -225,7 +225,7 @@ function addon:InitVendor(VendorDB)
 	self:addLookupList(VendorDB, 11189, L["Qia"], BZONE["Winterspring"], 61.36, 38.08, 0)
 	self:addLookupList(VendorDB, 11278, L["Magnus Frostwake"], BZONE["Western Plaguelands"], 67.98, 77.23, 0)
 	self:addLookupList(VendorDB, 11536, L["Quartermaster Miranda Breechlock"], BZONE["Eastern Plaguelands"], 81.06, 58.89, 0)
-	self:addLookupList(VendorDB, 11557, L["Meilosh"], BZONE["Felwood"], 63.97, 2.974, 4)
+	self:addLookupList(VendorDB, 11557, L["Meilosh"], BZONE["Felwood"], 63.97, 2.974, 0)
 	self:addLookupList(VendorDB, 11874, L["Masat T'andr"], BZONE["Swamp of Sorrows"], 25.46, 31.52, 0)
 	self:addLookupList(VendorDB, 12022, L["Lorelae Wintersong"], BZONE["Moonglade"], 48.39, 40.23, 0)
 	self:addLookupList(VendorDB, 12033, L["Wulan"], BZONE["Desolace"], 25.74, 69.15, 2)