diff --git a/comment.php b/comment.php
index bff9b0b..cccd44d 100644
--- a/comment.php
+++ b/comment.php
@@ -26,11 +26,11 @@ switch ($_REQUEST["comment"]):
         // $_POST['replyto'] - номер поста, на который отвечает
         // $_SESSION['userid'] - номер пользователя
         $newid = $DB->query('INSERT
-			INTO ?_aowow_comments(`type`, `typeid`, `userid`, `commentbody`, `post_date`{, ?#})
+			INTO '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments(`type`, `typeid`, `userid`, `commentbody`, `post_date`{, ?#})
 			VALUES (?d, ?d, ?d, ?, NOW(){, ?d})', (empty($_POST['replyto']) ? DBSIMPLE_SKIP : 'replyto'), $_GET["type"], $_GET["typeid"], (empty($_SESSION['userid']) ? 0 : $_SESSION['userid']), stripslashes($_POST['commentbody']), (empty($_POST['replyto']) ? DBSIMPLE_SKIP : $_POST['replyto'])
         );
         if (empty($_POST['replyto']))
-            $DB->query('UPDATE ?_aowow_comments SET `replyto`=?d WHERE `id`=?d LIMIT 1', $newid, $newid);
+            $DB->query('UPDATE '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments SET `replyto`=?d WHERE `id`=?d LIMIT 1', $newid, $newid);
         echo '<meta http-equiv="Refresh" content="0; URL=?' . urlfromtype($_GET["type"], $_GET["typeid"]) . '">';
         echo '<style type="text/css">';
         echo 'body {background-color: black;}';
@@ -40,7 +40,7 @@ switch ($_REQUEST["comment"]):
         // Удаление комментарий (Ajax)
         // Номер комментария: $_GET['id']
         // Имя пользователя, удаляющего комментарий: $_GET['username']
-        $DB->query('DELETE FROM ?_aowow_comments WHERE `id`=?d {AND `userid`=?d} LIMIT 1', $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
+        $DB->query('DELETE FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments WHERE `id`=?d {AND `userid`=?d} LIMIT 1', $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
         );
         break;
     case 'edit':
@@ -49,7 +49,7 @@ switch ($_REQUEST["comment"]):
         // Новое содержание комментария: $_POST['body']
         // Номер пользователя: $_SESSION['userid']
         if (IsSet($_POST['body']))
-            $DB->query('UPDATE ?_aowow_comments SET `commentbody`=?, `edit_userid`=?, `edit_date`=NOW() WHERE `id`=?d {AND `userid`=?d} LIMIT 1', stripslashes($_POST['body']), $_SESSION['userid'], $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
+            $DB->query('UPDATE '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments SET `commentbody`=?, `edit_userid`=?, `edit_date`=NOW() WHERE `id`=?d {AND `userid`=?d} LIMIT 1', stripslashes($_POST['body']), $_SESSION['userid'], $_GET['id'], ($_SESSION['roles'] > 1) ? DBSIMPLE_SKIP : $_SESSION['userid']
             );
         echo $_POST['body'];
         break;
@@ -61,8 +61,8 @@ switch ($_REQUEST["comment"]):
          * Номер пользователя: $_SESSION['userid']
          */
         // Проверка на хоть какое то значение рейтинга, и на то, что пользователь за этот коммент не голосовал
-        if (IsSet($_GET['rating']) and !($DB->selectCell('SELECT `commentid` FROM ?_aowow_comments_rates WHERE `userid`=?d AND `commentid`=?d LIMIT 1', $_SESSION['userid'], $_GET['id'])))
-            $DB->query('INSERT INTO ?_aowow_comments_rates(`commentid`, `userid`, `rate`) VALUES (?d, ?d, ?d)', $_GET['id'], $_SESSION['userid'], $_GET['rating']);
+        if (IsSet($_GET['rating']) and !($DB->selectCell('SELECT `commentid` FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates WHERE `userid`=?d AND `commentid`=?d LIMIT 1', $_SESSION['userid'], $_GET['id'])))
+            $DB->query('INSERT INTO '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates(`commentid`, `userid`, `rate`) VALUES (?d, ?d, ?d)', $_GET['id'], $_SESSION['userid'], $_GET['rating']);
         break;
     case 'undelete':
     // Восстановление комментария
diff --git a/faction.php b/faction.php
index fdad76e..1da6355 100644
--- a/faction.php
+++ b/faction.php
@@ -32,7 +32,7 @@ if (!$faction = load_cache(18, intval($id))) {
 
     $row = $DB->selectRow('
 			SELECT factionID, name_loc' . $_SESSION['locale'] . ', description1_loc' . $_SESSION['locale'] . ', description2_loc' . $_SESSION['locale'] . ', team, side
-			FROM ?_aowow_factions
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions
 			WHERE factionID=?d
 			LIMIT 1
 		', $id
@@ -49,7 +49,7 @@ if (!$faction = load_cache(18, intval($id))) {
         $faction['description2'] = $row['description2_loc' . $_SESSION['locale']];
         // Команда/Группа фракции
         if ($row['team'] != 0)
-            $faction['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $row['team']);
+            $faction['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $row['team']);
         // Альянс(1)/Орда(2)
         if ($row['side'] != 0)
             $faction['side'] = $row['side'];
@@ -57,7 +57,7 @@ if (!$faction = load_cache(18, intval($id))) {
         // Итемы с requiredreputationfaction
         $item_rows = $DB->select('
 			SELECT ?#, entry
-			FROM ?_item_template i, ?_aowow_icons a
+			FROM ?_item_template i, '.$UDWBaseconf['aowow']['db'].'?_aowow_icons a
 			WHERE
 				i.RequiredReputationFaction=?d
 				AND a.id=i.displayid
@@ -73,9 +73,9 @@ if (!$faction = load_cache(18, intval($id))) {
         // Персонажи, состоящие во фракции
         $creature_rows = $DB->select('
 			SELECT ?#, entry
-			FROM ?_creature_template, ?_aowow_factiontemplate
+			FROM ?_creature_template, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate
 			WHERE
-				FactionAlliance IN (SELECT factiontemplateID FROM ?_aowow_factiontemplate WHERE factionID=?d)
+				FactionAlliance IN (SELECT factiontemplateID FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate WHERE factionID=?d)
 				AND factiontemplateID=FactionAlliance
 			', $npc_cols[0], $id
         );
diff --git a/factions.php b/factions.php
index 067b679..63241d2 100644
--- a/factions.php
+++ b/factions.php
@@ -16,7 +16,7 @@ global $DB;
 
 $rows = $DB->select('
 	SELECT factionID, team, name_loc' . $_SESSION['locale'] . ' as name, side
-	FROM ?_aowow_factions
+	FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions
 	WHERE
 		reputationListID!=-1
 	'
@@ -29,7 +29,7 @@ if (!$factions = load_cache(19, 'x')) {
         $factions[$numRow] = array();
         $factions[$numRow]['entry'] = $row['factionID'];
         if ($row['team'] != 0)
-            $factions[$numRow]['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=? LIMIT 1', $row['team']);
+            $factions[$numRow]['group'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'?_aowow_factions WHERE factionID=? LIMIT 1', $row['team']);
         if ($row['side'])
             $factions[$numRow]['side'] = $row['side'];
         $factions[$numRow]['name'] = $row['name'];
diff --git a/includes/allcomments.php b/includes/allcomments.php
index 4c19ad8..490ecaf 100644
--- a/includes/allcomments.php
+++ b/includes/allcomments.php
@@ -21,10 +21,10 @@ require_once('includes/game.php');
 function getcomments($type, $typeid) {
     global $DB;
     global $rDB;
-
+    //TODO $UDWBaseconf['aowow']['db']
     $rows = $DB->select('
 		SELECT id, userid, post_date, commentbody, replyto
-		FROM ?_aowow_comments
+		FROM '.'host_mojotrollz_aowow'.'.?_aowow_comments
 		WHERE type=? AND typeid=?
 		ORDER BY replyto, post_date
 		', $type, $typeid
@@ -46,7 +46,7 @@ function getcomments($type, $typeid) {
             $comments[$i]['indent'] = 1;
 
         $comments[$i]['raters'] = array();
-        $comments[$i]['raters'] = $DB->select('SELECT userid, rate FROM ?_aowow_comments_rates WHERE commentid=?d', $comments[$i]['id']);
+        $comments[$i]['raters'] = $DB->select('SELECT userid, rate FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates WHERE commentid=?d', $comments[$i]['id']);
         $comments[$i]['rating'] = sum_subarrays_by_key($comments[$i]['raters'], 'rate');
         $comments[$i]['purged'] = ($comments[$i]['rating'] <= -50) ? 1 : 0;
         $comments[$i]['deleted'] = 0;
diff --git a/includes/allitems.php b/includes/allitems.php
index 0c3f58c..2b99a25 100644
--- a/includes/allitems.php
+++ b/includes/allitems.php
@@ -132,7 +132,8 @@ function b_type($type, $value) {
  */
 function req_spell($spell_id) {
     global $aDB;
-    return $aDB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $spell_id);
+    //TODO $UDWBaseconf['aowow']['db']
+    return $aDB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=?d LIMIT 1', $spell_id);
 }
 
 /**
@@ -177,7 +178,7 @@ function spell_to_bonus($spell_id, $trigger) {
 function allitemsinfo2(&$Row, $level=0) {
     // Empty string
     if (!isset($Row['entry']))
-        return;
+        return array();
     // Global array of information
     global $allitems;
     //  Number of the next element
@@ -241,6 +242,7 @@ function allitemsinfo($id, $level=0) {
     if (isset($allitems[$id])) {
         return $allitems[$id];
     } else {
+        //TODO $UDWBaseconf['aowow']['db']
         $row = $DB->selectRow('
 			SELECT i.?#
 			{
@@ -248,7 +250,7 @@ function allitemsinfo($id, $level=0) {
 				, l.description_loc' . $_SESSION['locale'] . ' as `description_loc`
 				, ?
 			}
-			FROM ?_aowow_icons, ?_item_template i
+			FROM '.'host_mojotrollz_aowow'.'.?_aowow_icons, ?_item_template i
 			{
 				LEFT JOIN (?_locales_item l)
 				ON l.entry=i.entry AND ?
@@ -300,7 +302,8 @@ function render_item_tooltip(&$Row) {
 
     // Локация, для которой предназначен этот предмет
     if ($Row['Map'])
-        $x .= '<br />' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_zones WHERE mapid=?d LIMIT 1', $Row['Map']);;
+        //TODO $UDWBaseconf['aowow']['db']
+        $x .= '<br />' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_zones WHERE mapid=?d LIMIT 1', $Row['Map']);;
 
     // Теперь в зависимости от типа предмета
     if ($Row['ContainerSlots'] > 1)
@@ -380,7 +383,8 @@ function render_item_tooltip(&$Row) {
 
     // Требуемый скилл (755 - Jewecrafting)
     if (($Row['RequiredSkill']) and ($Row['RequiredSkill'] != 755)) {
-        $x .= LOCALE_REQUIRES . ' ' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_skill WHERE skillID=?d LIMIT 1', $Row['RequiredSkill']);
+        //TODO $UDWBaseconf['aowow']['db']
+        $x .= LOCALE_REQUIRES . ' ' . $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_skill WHERE skillID=?d LIMIT 1', $Row['RequiredSkill']);
         if ($Row['RequiredSkillRank'])
             $x .= ' (' . $Row['RequiredSkillRank'] . ')';
         $x .= '<br />';
@@ -427,7 +431,8 @@ function render_item_tooltip(&$Row) {
 // Item Set
     // Временное хранилище всех вещей;
     $x_tmp = '';
-    $row = $DB->selectRow('SELECT ?# FROM ?_aowow_itemset WHERE (item1=?d or item2=?d or item3=?d or item4=?d or item5=?d or item6=?d or item7=?d or item8=?d or item9=?d or item10=?d) LIMIT 1', $itemset_col[1], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry']);
+    //TODO $UDWBaseconf['aowow']['db']
+    $row = $DB->selectRow('SELECT ?# FROM '.'host_mojotrollz_aowow'.'.?_aowow_itemset WHERE (item1=?d or item2=?d or item3=?d or item4=?d or item5=?d or item6=?d or item7=?d or item8=?d or item9=?d or item10=?d) LIMIT 1', $itemset_col[1], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry'], $Row['entry']);
     if ($row) {
         $num = 0; // Кол-во вещей в наборе
         for ($i = 1; $i <= 10; $i++) {
@@ -440,7 +445,8 @@ function render_item_tooltip(&$Row) {
         $x .= '<span class="q"><a href="?itemset=' . $row['itemsetID'] . '" class="q">' . $row['name_loc' . $_SESSION['locale']] . '</a> (0/' . $num . ')</span>';
         // Если требуется скилл
         if ($row['skillID']) {
-            $name = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_skill WHERE skillID=?d LIMIT 1', $row['skillID']);
+            //TODO $UDWBaseconf['aowow']['db']
+            $name = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_skill WHERE skillID=?d LIMIT 1', $row['skillID']);
             $x .= LOCALE_REQUIRES . ' <a href="?spells=11.' . $row['skillID'] . '" class="q1">' . $name . '</a>';
             if ($row['skilllevel'])
                 $x .= ' (' . $row['skilllevel'] . ')';
@@ -579,9 +585,10 @@ function iteminfo2(&$Row, $level=0) {
         }
         // Открывает:
         // Тип замков, для которых этот предмет является ключем:
+        //TODO $UDWBaseconf['aowow']['db']
         $locks_row = $DB->selectCol('
 			SELECT lockID
-			FROM ?_aowow_lock
+			FROM '.'host_mojotrollz_aowow'.'.?_aowow_lock
 			WHERE
 				(type1=1 AND lockproperties1=?d) OR
 				(type2=1 AND lockproperties2=?d) OR
@@ -621,6 +628,7 @@ function iteminfo2(&$Row, $level=0) {
 function iteminfo($id, $level=0) {
     global $item_cols;
     global $DB;
+    //TODO $UDWBaseconf['aowow']['db']
     $row = $DB->selectRow('
 		SELECT i.?#, i.entry, maxcount
 		{
@@ -628,7 +636,7 @@ function iteminfo($id, $level=0) {
 			, l.description_loc' . $_SESSION['locale'] . ' as `description_loc`
 			, ?
 		}
-		FROM ?_aowow_icons, ?_item_template i
+		FROM '.'host_mojotrollz_aowow'.'.?_aowow_icons, ?_item_template i
 		{ LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ? }
 		WHERE
 			(i.entry=?d and id=displayid)
diff --git a/includes/allnpcs.php b/includes/allnpcs.php
index 6957f20..ea76c65 100644
--- a/includes/allnpcs.php
+++ b/includes/allnpcs.php
@@ -59,7 +59,7 @@ function creatureinfo($id) {
 			, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
 			, ?
 		}
-		FROM ?_aowow_factiontemplate, ?_creature_template c
+		FROM '.'host_mojotrollz_aowow'.'.?_aowow_factiontemplate, ?_creature_template c
 		{
 			LEFT JOIN (?_locales_creature l)
 			ON l.entry=c.entry AND ?
diff --git a/includes/allobjects.php b/includes/allobjects.php
index 1fe9177..c33261d 100644
--- a/includes/allobjects.php
+++ b/includes/allobjects.php
@@ -368,7 +368,7 @@ function objectinfo2(&$Row, $level=0) {
         if ($object['lockid']) {
             $lock_row = $DB->selectRow('
 				SELECT *
-				FROM ?_aowow_lock
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_lock
 				WHERE lockID=?d
 				LIMIT 1
 				', $object['lockid']
diff --git a/includes/allquests.php b/includes/allquests.php
index e48fb1e..35877df 100644
--- a/includes/allquests.php
+++ b/includes/allquests.php
@@ -430,7 +430,7 @@ function GetQuestInfo(&$data, $dataflag = QUEST_DATAFLAG_MINIMUM) {
         if ($data['SpecialFlags'] & QUEST_SPECIALFLAGS_REPEATABLE)
             $data['Repeatable'] = true;
         if ($data['CharTitleId'] > 0)
-            $data['titlereward'] = $DB->selectCell('SELECT name FROM ?_aowow_char_titles WHERE id=?d LIMIT 1', $row['CharTitleId']);
+            $data['titlereward'] = $DB->selectCell('SELECT name FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_char_titles WHERE id=?d LIMIT 1', $row['CharTitleId']);
     }
 
     // Награды и задания
@@ -441,12 +441,12 @@ function GetQuestInfo(&$data, $dataflag = QUEST_DATAFLAG_MINIMUM) {
         for ($j = 0; $j <= 6; ++$j)
             if (($data['RewChoiceItemId' . $j] != 0) and ($data['RewChoiceItemCount' . $j] != 0))
                 $data['itemchoices'][] = array_merge(
-                        array(allitemsinfo($data['RewChoiceItemId' . $j], 0)), array('count' => $data['RewChoiceItemCount' . $j])
+                        allitemsinfo($data['RewChoiceItemId' . $j], 0), array('count' => $data['RewChoiceItemCount' . $j])
                 );
         for ($j = 0; $j <= 4; ++$j)
             if (($data['RewItemId' . $j] != 0) and ($data['RewItemCount' . $j] != 0))
                 $data['itemrewards'][] = array_merge(
-                        array(allitemsinfo($data['RewItemId' . $j], 0)), array('count' => $data['RewItemCount' . $j])
+                        allitemsinfo($data['RewItemId' . $j], 0), array('count' => $data['RewItemCount' . $j])
                 );
         // Вознаграждение репутацией
         for ($j = 1; $j <= 5; $j++)
diff --git a/includes/allspells.php b/includes/allspells.php
index ea088d8..a3b85eb 100644
--- a/includes/allspells.php
+++ b/includes/allspells.php
@@ -314,7 +314,7 @@ function spell_desc($spellid, $type='tooltip') {
     global $spell_cols;
     $spellRow = $DB->selectRow('
 		SELECT ?#
-		FROM ?_aowow_spell, ?_aowow_spellicons
+		FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons
 		WHERE
 			spellID=?
 			AND id=spellicon
@@ -333,12 +333,12 @@ function spell_desc($spellid, $type='tooltip') {
 function spell_desc2($spellRow, $type='tooltip') {
     global $DB;
 
-//	$spellRow = $DB->selectRow('SELECT s.*, i.iconname FROM ?_aowow_spell s, ?_aowow_spellicons i WHERE s.spellID=? AND i.id=s.spellicon LIMIT 1', $spellID);
+//	$spellRow = $DB->selectRow('SELECT s.*, i.iconname FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell s, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons i WHERE s.spellID=? AND i.id=s.spellicon LIMIT 1', $spellID);
 
     allspellsinfo2($spellRow);
 
     if (!IsSet($spellRow['duration_base']))
-        $lastduration = $DB->selectRow('SELECT * FROM ?_aowow_spellduration WHERE durationID=? LIMIT 1', $spellRow['durationID']);
+        $lastduration = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellduration WHERE durationID=? LIMIT 1', $spellRow['durationID']);
 
     $signs = array('+', '-', '/', '*', '%', '^');
 
@@ -380,7 +380,7 @@ function spell_desc2($spellRow, $type='tooltip') {
         switch ($exprType) {
             case 'r':
                 if (!IsSet($spellRow['rangeMax']))
-                    $spellRow = array_merge($spellRow, $DB->selectRow('SELECT * FROM ?_aowow_spellrange WHERE rangeID=? LIMIT 1', $spellRow['rangeID']));
+                    $spellRow = array_merge($spellRow, $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellrange WHERE rangeID=? LIMIT 1', $spellRow['rangeID']));
 
                 $base = $spellRow['rangeMax'];
 
@@ -395,7 +395,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'c':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -411,7 +411,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 's':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -429,8 +429,8 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'o':
                 if ($lookup > 0) {
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
-                    $lastduration = $DB->selectRow('SELECT * FROM ?_aowow_spellduration WHERE durationID=? LIMIT 1', $spell['durationID']);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $lastduration = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellduration WHERE durationID=? LIMIT 1', $spell['durationID']);
                 }
                 else
                     $spell = $spellRow;
@@ -446,7 +446,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 't':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -468,7 +468,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'm':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -487,7 +487,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'x':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -502,7 +502,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'q':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -519,12 +519,12 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'a':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
                 $exprData[0] = 1; // TODO
-                $radius = $DB->selectCell('SELECT radiusBase FROM ?_aowow_spellradius WHERE radiusID=? LIMIT 1', $spell['effect' . $exprData[0] . 'radius']);
+                $radius = $DB->selectCell('SELECT radiusBase FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellradius WHERE radiusID=? LIMIT 1', $spell['effect' . $exprData[0] . 'radius']);
                 $base = $radius;
 
                 if (in_array($op, $signs) && is_numeric($oparg) && is_numeric($base)) {
@@ -535,7 +535,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'h':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -549,7 +549,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'f':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -563,7 +563,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'n':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -577,7 +577,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'd':
                 if ($lookup > 0) {
-                    $spell = $DB->selectRow('SELECT durationBase FROM ?_aowow_spell a, ?_aowow_spellduration b WHERE a.durationID = b.durationID AND a.spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT durationBase FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell a, '.'host_mojotrollz_aowow'.'.?_aowow_spellduration b WHERE a.durationID = b.durationID AND a.spellID=? LIMIT 1', $lookup);
                     @$base = ($spell['durationBase'] > 0 ? $spell['durationBase'] + 1 : 0);
                 }
                 else
@@ -600,7 +600,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'e':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -625,7 +625,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'u':
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=?d LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -642,7 +642,7 @@ function spell_desc2($spellRow, $type='tooltip') {
                 break;
             case 'b': // only used at one spell (14179) should be 20, column 110/111/112?)
                 if ($lookup > 0)
-                    $spell = $DB->selectRow('SELECT * FROM ?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
+                    $spell = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell WHERE spellID=? LIMIT 1', $lookup);
                 else
                     $spell = $spellRow;
 
@@ -686,9 +686,9 @@ function render_spell_tooltip(&$row) {
 
     // Время каста
     if ($row['spellcasttimesID'] > 1)
-        $casttime = ($DB->selectCell('SELECT base FROM ?_aowow_spellcasttimes WHERE id=? LIMIT 1', $row['spellcasttimesID'])) / 1000;
+        $casttime = ($DB->selectCell('SELECT base FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellcasttimes WHERE id=? LIMIT 1', $row['spellcasttimesID'])) / 1000;
     // Дальность действия
-    $range = $DB->selectCell('SELECT rangeMax FROM ?_aowow_spellrange WHERE rangeID=? LIMIT 1', $row['rangeID']);
+    $range = $DB->selectCell('SELECT rangeMax FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellrange WHERE rangeID=? LIMIT 1', $row['rangeID']);
 
     // Реагенты
     $reagents = array();
@@ -828,7 +828,7 @@ function allspellsinfo2(&$row, $level=0) {
         if (IsSet($allitems[$row['effect1itemtype']]['icon']))
             $allspells[$num]['icon'] = trim($allitems[$row['effect1itemtype']]['icon'], "\r");
         else
-            $allspells[$num]['icon'] = trim($DB->selectCell('SELECT iconname FROM ?_aowow_icons WHERE id=(SELECT displayid FROM ?_item_template WHERE entry=?d LIMIT 1) LIMIT 1', $row['effect1itemtype']) , "\r");
+            $allspells[$num]['icon'] = trim($DB->selectCell('SELECT iconname FROM '.'host_mojotrollz_aowow'.'.?_aowow_icons WHERE id=(SELECT displayid FROM ?_item_template WHERE entry=?d LIMIT 1) LIMIT 1', $row['effect1itemtype']) , "\r");
     } else {
         $allspells[$num]['icon'] = trim($row['iconname'], "\r");
     }
@@ -863,7 +863,7 @@ function spell_buff_render($row) {
 
     // Тип диспела
     if ($row['dispeltypeID']) {
-        $dispel = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spelldispeltype WHERE id=? LIMIT 1', $row['dispeltypeID']);
+        $dispel = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_spelldispeltype WHERE id=? LIMIT 1', $row['dispeltypeID']);
         $x .= '<th><b class="q">' . $dispel . '</b></th>';
     }
 
@@ -875,7 +875,7 @@ function spell_buff_render($row) {
     $x .= spell_desc2($row, 'buff') . '<br>';
 
     // Длительность баффа
-    $duration = $DB->selectCell("SELECT durationBase FROM ?_aowow_spellduration WHERE durationID=? LIMIT 1", $row['durationID']);
+    $duration = $DB->selectCell('SELECT durationBase FROM '.'host_mojotrollz_aowow'.'.?_aowow_spellduration WHERE durationID=? LIMIT 1', $row['durationID']);
     if ($duration > 0)
         $x .= '<span class="q">' . ($duration / 1000) . ' seconds remaining</span>';
 
@@ -896,9 +896,10 @@ function allspellsinfo($id, $level=0) {
     global $spell_cols;
     if (isset($allitems[$id]))
         return $allitems[$id];
+    //TODO $UDWBaseconf['aowow']['db'];
     $row = $DB->selectRow('
 		SELECT ?#
-		FROM ?_aowow_spell s, ?_aowow_spellicons i
+		FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell s, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons i
 		WHERE
 			s.spellID=?
 			AND i.id = s.spellicon
@@ -920,9 +921,10 @@ function allspellsinfo($id, $level=0) {
  */
 function spellinfo($id) {
     global $DB;
+    //TODO $UDWBaseconf['aowow']['db']
     $row = $DB->selectRow('
 		SELECT s.*, i.iconname
-		FROM ?_aowow_spell s, ?_aowow_spellicons i
+		FROM '.'host_mojotrollz_aowow'.'.?_aowow_spell s, '.'host_mojotrollz_aowow'.'.?_aowow_spellicons i
 		WHERE
 			s.spellID=?
 			AND i.id = s.spellicon
@@ -953,7 +955,7 @@ function spellinfo2(&$row) {
         $spell['cat'] = 0;
         // Скилл
 //		if(!(isset($row['skillID'])))
-//		$skillrow = list($row['skillID'],$row['req_skill_value'],$row['min_value'],$row['max_value']);//$DB->selectRow('SELECT skillID, req_skill_value, min_value, max_value  FROM ?_aowow_skill_line_ability WHERE spellID=?d LIMIT 1', $spell['entry']);
+//		$skillrow = list($row['skillID'],$row['req_skill_value'],$row['min_value'],$row['max_value']);//$DB->selectRow('SELECT skillID, req_skill_value, min_value, max_value  FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability WHERE spellID=?d LIMIT 1', $spell['entry']);
         if (isset($row['skillID'])) {
 //			if($skillrow['req_skill_value'] != 1)
 //				$spell['learnedat'] = $skillrow['req_skill_value'];
@@ -994,9 +996,10 @@ function spellinfo2(&$row) {
                 $spell['creates'][$i]['entry'] = $row['effect' . $j . 'itemtype'];
                 $spell['creates'][$i]['count'] = $row['effect' . $j . 'BasePoints'] + 1;
                 if (!(isset($allitems[$spell['creates'][$i]['entry']]))) {
+                    //TODO $UDWBaseconf['aowow']['db']
                     $createrow = $DB->selectRow('
 						SELECT ?#
-						FROM ?_item_template, ?_aowow_icons
+						FROM ?_item_template, '.'host_mojotrollz_aowow'.'.?_aowow_icons
 						WHERE
 							entry=?d
 							AND id=displayid
diff --git a/includes/game.php b/includes/game.php
index c2855d7..e646385 100644
--- a/includes/game.php
+++ b/includes/game.php
@@ -244,7 +244,7 @@ function coord_db2wow($mapid, $x, $y, $global) {
     // Подключение к базе
     global $DB;
 
-    $rows = $DB->select("SELECT * FROM ?_aowow_zones WHERE (mapID=? and x_min<? and x_max>? and y_min<? and y_max>?)", $mapid, $x, $x, $y, $y);
+    $rows = $DB->select('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_zones WHERE (mapID=? and x_min<? and x_max>? and y_min<? and y_max>?)', $mapid, $x, $x, $y, $y);
 
     foreach ($rows as $numRow => $row) {
         // Сохраяняем имя карты и координаты
@@ -279,7 +279,7 @@ function coord_db2wow($mapid, $x, $y, $global) {
     if (count($rows) == 0) {
         // Ничего не найдено. Мб инста??
 
-        $row = $DB->selectRow("SELECT * FROM ?_aowow_zones WHERE (mapID=? and x_min=0 and x_max=0 and y_min=0 and y_max=0)", $mapid);
+        $row = $DB->selectRow('SELECT * FROM '.'host_mojotrollz_aowow'.'.?_aowow_zones WHERE (mapID=? and x_min=0 and x_max=0 and y_min=0 and y_max=0)', $mapid);
         if ($row) {
             $wow['zone'] = $row['areatableID'];
             $wow['name'] = $row['name_loc' . $_SESSION['locale']];
@@ -345,7 +345,7 @@ function mass_coord(&$data) {
  */
 function factioninfo($id) {
     global $DB;
-    $faction['name'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID = ?d LIMIT 1', $id);
+    $faction['name'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.'host_mojotrollz_aowow'.'.?_aowow_factions WHERE factionID = ?d LIMIT 1', $id);
     $faction['entry'] = $id;
     return $faction;
 }
@@ -374,7 +374,7 @@ function loot_table($table, $lootid, $max_percent=100) {
 		SELECT l.ChanceOrQuestChance, l.mincountOrRef, l.maxcount as `d-max`, l.groupid, ?#, i.entry, i.maxcount
 			{, loc.name_loc?d AS `name_loc`}
 		FROM ' . $table . ' l
-			LEFT JOIN (?_aowow_icons a, ?_item_template i) ON l.item=i.entry AND a.id=i.displayid
+			LEFT JOIN ('.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i) ON l.item=i.entry AND a.id=i.displayid
 			{LEFT JOIN (?_locales_item loc) ON loc.entry=i.entry AND ?d}
 		WHERE
 			l.entry=?d
diff --git a/item.php b/item.php
index 1ea47e3..0615066 100644
--- a/item.php
+++ b/item.php
@@ -47,7 +47,7 @@ if (!$item = load_cache(5, $id)) {
 					, l.name_loc?d as `name_loc`
 					, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
 				}
-				FROM ?_aowow_factiontemplate, ?_creature_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 				{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
 				WHERE
 					lootid=?d
@@ -81,7 +81,7 @@ if (!$item = load_cache(5, $id)) {
 						, l.name_loc?d as `name_loc`
 						, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
 					}
-					FROM ?_aowow_factiontemplate, ?_creature_template c
+					FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 					{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
 					WHERE
 	                                        c.lootid = ?d
@@ -108,7 +108,7 @@ if (!$item = load_cache(5, $id)) {
             // Сундуки
             $rows = $DB->select('
 				SELECT g.entry, g.name, g.type, a.lockproperties1
-				FROM ?_gameobject_template g, ?_aowow_lock a
+				FROM ?_gameobject_template g, '.$UDWBaseconf['aowow']['db'].'.?_aowow_lock a
 				WHERE
 					g.data1=?d
 					AND g.type=?d
@@ -147,7 +147,7 @@ if (!$item = load_cache(5, $id)) {
 			, l.name_loc?d as `name_loc`
 			, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
 		}
-		FROM ?_npc_vendor v, ?_aowow_factiontemplate, ?_creature_template c
+		FROM ?_npc_vendor v, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 		{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
 		WHERE
 			v.item=?d
@@ -166,7 +166,7 @@ if (!$item = load_cache(5, $id)) {
               if ($row['ExtendedCost'])
               {
               $item['soldby'][$numRow]['cost'] = array();
-              $extcost = $DB->selectRow('SELECT * FROM ?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
+              $extcost = $DB->selectRow('SELECT * FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
               if ($extcost['reqhonorpoints']>0)
               $item['soldby'][$numRow]['cost']['honor'] = (($row['A']==1)? 1: -1) * $extcost['reqhonorpoints'];
               if ($extcost['reqarenapoints']>0)
@@ -238,7 +238,7 @@ if (!$item = load_cache(5, $id)) {
             $rows = $DB->select('
 				SELECT c.?#, c.entry, maxcount
 				{ , l.name_loc?d AS `name_loc`}
-				FROM ?_aowow_icons, ?_item_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 				{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
 				WHERE
 					c.entry=?d
@@ -269,7 +269,7 @@ if (!$item = load_cache(5, $id)) {
 					, l.name_loc?d as `name_loc`
 					, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
 				}
-				FROM ?_aowow_factiontemplate, ?_creature_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 				{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
 				WHERE
 					pickpocketloot=?d
@@ -296,7 +296,7 @@ if (!$item = load_cache(5, $id)) {
 					, l.name_loc?d as `name_loc`
 					, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
 				}
-				FROM ?_aowow_factiontemplate, ?_creature_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 				{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
 				WHERE
 					skinloot=?d
@@ -326,7 +326,7 @@ if (!$item = load_cache(5, $id)) {
 				{
 					, l.name_loc?d as `name_loc`
 				}
-				FROM ?_aowow_icons, ?_item_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 				{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
 				WHERE
 					DisenchantID=?d
@@ -352,7 +352,7 @@ if (!$item = load_cache(5, $id)) {
 			{
 				, l.name_loc?d as `name_loc`
 			}
-			FROM ?_aowow_icons, ?_item_template c
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 			{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
 			WHERE
 				BagFamily=?d
@@ -371,7 +371,7 @@ if (!$item = load_cache(5, $id)) {
     // Реагент для...
     $rows_r = $DB->select('
 		SELECT ?#, spellID
-		FROM ?_aowow_spell s, ?_aowow_spellicons i
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
 		WHERE
 			(( reagent1=?d
 			OR reagent2=?d
@@ -417,7 +417,7 @@ if (!$item = load_cache(5, $id)) {
     // Создается из...
     $rows_cf = $DB->select('
 		SELECT ?#, s.spellID
-		FROM ?_aowow_spell s, ?_aowow_spellicons i
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
 		WHERE
 			((s.effect1itemtype=?d
 			OR s.effect2itemtype=?d
@@ -430,7 +430,7 @@ if (!$item = load_cache(5, $id)) {
         foreach ($rows_cf as $numRow => $row) {
             $skillrow = $DB->selectRow('
 				SELECT skillID, min_value, max_value
-				FROM ?_aowow_skill_line_ability
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability
 				WHERE spellID=?d
 				LIMIT 1', $row['spellID']
             );
@@ -449,7 +449,7 @@ if (!$item = load_cache(5, $id)) {
             // Обычные локации
             $row = $DB->selectRow('
 				SELECT name_loc' . $_SESSION['locale'] . ' AS name, areatableID as id
-				FROM ?_aowow_zones
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_zones
 				WHERE
 					areatableID=?d
 					AND (x_min!=0 AND x_max!=0 AND y_min!=0 AND y_max!=0)
@@ -462,7 +462,7 @@ if (!$item = load_cache(5, $id)) {
                 // Инсты
                 $row = $DB->selectRow('
 					SELECT name_loc' . $_SESSION['locale'] . ' AS name, mapID as id
-					FROM ?_aowow_zones
+					FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_zones
 					WHERE
 						areatableID=?d
 					LIMIT 1
diff --git a/items.php b/items.php
index b86dce7..e1db546 100644
--- a/items.php
+++ b/items.php
@@ -29,7 +29,7 @@ if (!$items = load_cache(7, $cache_str)) {
     $rows = $DB->select('
 		SELECT ?#, i.entry, maxcount
 			{, l.name_loc?d AS `name_loc`}
-		FROM ?_aowow_icons, ?_item_template i
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template i
 			{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?d}
 		WHERE
 			id=displayid
diff --git a/itemset.php b/itemset.php
index 40e6455..fcca934 100644
--- a/itemset.php
+++ b/itemset.php
@@ -22,7 +22,7 @@ $id = $podrazdel;
 if (!$itemset = load_cache(8, intval($id))) {
     unset($itemset);
 
-    $row = $DB->selectRow("SELECT * FROM ?_aowow_itemset WHERE itemsetID=? LIMIT 1", $id);
+    $row = $DB->selectRow("SELECT * FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset WHERE itemsetID=? LIMIT 1", $id);
     if ($row) {
         $itemset = array();
         $itemset['entry'] = $row['itemsetID'];
diff --git a/itemsets.php b/itemsets.php
index dc2c5c5..47dee4b 100644
--- a/itemsets.php
+++ b/itemsets.php
@@ -24,7 +24,7 @@ if (!$itemsets = load_cache(9, 'x')) {
 
     $rows = $DB->select('
 		SELECT ?#
-		FROM ?_aowow_itemset
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset
 		ORDER by name_loc' . $_SESSION['locale'] . '
 		{LIMIT ?d}', $itemset_col[0], ($UDWBaseconf['limit'] != 0) ? $UDWBaseconf['limit'] : DBSIMPLE_SKIP
     );
diff --git a/latest.php b/latest.php
index cb3fa1a..7d6081c 100644
--- a/latest.php
+++ b/latest.php
@@ -17,7 +17,7 @@ switch ($_GET['latest']) {
         $comments = array();
         $rows = $DB->select('
 			SELECT `id`, `type`, `typeID`, LEFT(`commentbody`, 120) as `preview`, `userID` as `user`, `post_date` as `date`, (NOW()-`post_date`) as `elapsed`
-			FROM ?_aowow_comments
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments
 			WHERE 1
 			ORDER BY post_date DESC
 			LIMIT 300');
@@ -35,19 +35,19 @@ switch ($_GET['latest']) {
                     $comments[$i]['subject'] = $DB->selectCell('SELECT name FROM ?_item_template WHERE entry=?d LIMIT 1', $row['typeID']);
                     break;
                 case 4: // Item Set
-                    $comments[$i]['subject'] = $DB->selectCell('SELECT name FROM ?_aowow_itemset WHERE itemsetID=?d LIMIT 1', $row['typeID']);
+                    $comments[$i]['subject'] = $DB->selectCell('SELECT name FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset WHERE itemsetID=?d LIMIT 1', $row['typeID']);
                     break;
                 case 5: // Quest
                     $comments[$i]['subject'] = $DB->selectCell('SELECT Title FROM ?_quest_template WHERE entry=?d LIMIT 1', $row['typeID']);
                     break;
                 case 6: // Spell
-                    $comments[$i]['subject'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $row['typeID']);
+                    $comments[$i]['subject'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellID=?d LIMIT 1', $row['typeID']);
                     break;
                 case 7: // Zone
                     // TODO
                     break;
                 case 8: // Faction
-                    $comments[$i]['subject'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $row['typeID']);
+                    $comments[$i]['subject'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $row['typeID']);
                     break;
                 default:
                     $comments[$i]['subject'] = $DB->selectCell('SELECT name FROM ?_' . $types[$row['type']] . '_template WHERE entry=?d LIMIT 1', $row['typeID']);
@@ -56,7 +56,7 @@ switch ($_GET['latest']) {
             $comments[$i]['user'] = $rDB->selectCell('SELECT username FROM ?_account WHERE id=?d LIMIT 1', $row['user']);
             if (empty($comments[$i]['user']))
                 $comments[$i]['user'] = 'Anonymous';
-            $comments[$i]['rating'] = array_sum($DB->selectCol('SELECT rate FROM ?_aowow_comments_rates WHERE commentid=?d', $row['id']));
+            $comments[$i]['rating'] = array_sum($DB->selectCol('SELECT rate FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_comments_rates WHERE commentid=?d', $row['id']));
             $comments[$i]['purged'] = ($comments[$i]['rating'] <= -50) ? 1 : 0;
             $comments[$i]['deleted'] = 0;
         }
diff --git a/main.php b/main.php
index 02db682..be9ea6e 100644
--- a/main.php
+++ b/main.php
@@ -11,7 +11,7 @@
  */
 
 // Загружаем новости
-$rows = @$DB->select('SELECT text_loc?d AS text FROM ?_aowow_news ORDER BY time DESC, id DESC LIMIT 5', $_SESSION['locale']);
+$rows = @$DB->select('SELECT text_loc?d AS text FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_news ORDER BY time DESC, id DESC LIMIT 5', $_SESSION['locale']);
 if ($rows)
     $smarty->assign('news', $rows);
 
diff --git a/npc.php b/npc.php
index 117937f..243a235 100644
--- a/npc.php
+++ b/npc.php
@@ -37,7 +37,7 @@ if (!$npc = load_cache(1, intval($id))) {
 				?,
 			}
 			f.name_loc' . $_SESSION['locale'] . ' as `faction-name`, ft.factionID as `factionID`
-		FROM ?_aowow_factiontemplate ft, ?_aowow_factions f, ?_creature_template c
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate ft, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions f, ?_creature_template c
 		{
 			LEFT JOIN (?_locales_creature l)
 			ON l.entry=c.entry AND ?
@@ -140,9 +140,9 @@ if (!$npc = load_cache(1, intval($id))) {
                 for ($k = 1; $k <= 3; $k++) {
                     $spellrow = $DB->selectRow('
 						SELECT ?#, spellID
-						FROM ?_aowow_spell, ?_aowow_spellicons
+						FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons
 						WHERE
-							spellID=(SELECT effect' . $k . 'triggerspell FROM ?_aowow_spell WHERE spellID=?d AND (effect' . $k . 'id IN (36,57)))
+							spellID=(SELECT effect' . $k . 'triggerspell FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellID=?d AND (effect' . $k . 'id IN (36,57)))
 							AND id=spellicon
 						LIMIT 1
 						', $spell_cols[2], $row['Spell' . $j]
@@ -159,7 +159,7 @@ if (!$npc = load_cache(1, intval($id))) {
     // Если это просто тренер
     $teachspells = $DB->select('
 		SELECT ?#, spellID
-		FROM ?_npc_trainer, ?_aowow_spell, ?_aowow_spellicons
+		FROM ?_npc_trainer, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons
 		WHERE
 			entry=?d
 			AND spellID=Spell
@@ -181,7 +181,7 @@ if (!$npc = load_cache(1, intval($id))) {
     $rows_s = $DB->select('
 		SELECT ?#, i.entry, i.maxcount, n.`maxcount` as `drop-maxcount`
 			{, l.name_loc?d AS `name_loc`}
-		FROM ?_npc_vendor n, ?_aowow_icons, ?_item_template i
+		FROM ?_npc_vendor n, '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template i
 			{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?d}
 		WHERE
 			n.entry=?
@@ -198,7 +198,7 @@ if (!$npc = load_cache(1, intval($id))) {
             $npc['sells'][$numRow]['cost'] = array();
             /* if ($row['ExtendedCost']) [NOTE] overwrite with honor points? 
               {
-              $extcost = $DB->selectRow('SELECT * FROM ?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
+              $extcost = $DB->selectRow('SELECT * FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_item_extended_cost WHERE extendedcostID=?d LIMIT 1', $row['ExtendedCost']);
               if ($extcost['reqhonorpoints']>0)
               $npc['sells'][$numRow]['cost']['honor'] = (($npc['A']==1)? 1: -1) * $extcost['reqhonorpoints'];
               if ($extcost['reqarenapoints']>0)
@@ -234,10 +234,10 @@ if (!$npc = load_cache(1, intval($id))) {
 
     // Начиниают квесты...
     $rows_qs = $DB->select('
-		SELECT c.?#
-		FROM ?_quest_relations c, ?_quest_template q
+		SELECT ?#
+		FROM ?_creature_questrelation c, ?_quest_template q
 		WHERE
-			c.entry=?
+			c.id=?
 			AND q.entry=c.quest
 		', $quest_cols[2], $id
     );
@@ -251,10 +251,10 @@ if (!$npc = load_cache(1, intval($id))) {
 
     // Заканчивают квесты...
     $rows_qe = $DB->select('
-		SELECT c.?#
-		FROM ?_quest_relations c, ?_quest_template q
+		SELECT ?#
+		FROM ?_creature_questrelation c, ?_quest_template q
 		WHERE
-			c.entry=?
+			c.id=?
 			AND q.entry=c.quest
 		', $quest_cols[2], $id
     );
diff --git a/npcs.php b/npcs.php
index 2997d86..c2a2372 100644
--- a/npcs.php
+++ b/npcs.php
@@ -34,7 +34,7 @@ if (!$npcs = load_cache(2, $cache_str)) {
 			, l.name_loc?d as `name_loc`
 			, l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc`
 		}
-		FROM ?_aowow_factiontemplate, ?_creature_template c
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 		{ LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? }
 		WHERE 1=1
 			{AND creatureType=?}
diff --git a/object.php b/object.php
index f3f306e..a1ce781 100644
--- a/object.php
+++ b/object.php
@@ -33,9 +33,9 @@ if (!$object = load_cache(3, intval($id))) {
     // Начиниают квесты...
     $rows_qs = $DB->select('
 		SELECT o.?#
-		FROM ?_quest_relations q, ?_quest_template o
+		FROM ?_gameobject_questrelation q, ?_quest_template o
 		WHERE
-			q.entry = ?d
+			q.id = ?d
 			AND o.entry = q.quest
 		', $quest_cols[2], $id
     );
@@ -49,9 +49,9 @@ if (!$object = load_cache(3, intval($id))) {
     // Заканчивают квесты...
     $rows_qe = $DB->select('
 		SELECT i.?#
-		FROM ?_quest_relations i, ?_quest_template q
+		FROM ?_gameobject_questrelation i, ?_quest_template q
 		WHERE
-			i.entry = ?d
+			i.id = ?d
 			AND q.entry = i.quest
 		', $quest_cols[2], $id
     );
diff --git a/objects.php b/objects.php
index d38dbd4..0858d3f 100644
--- a/objects.php
+++ b/objects.php
@@ -25,7 +25,7 @@ if (!$data = load_cache(4, intval($type))) {
     $rows = $DB->select('
 			SELECT g.* {, a.requiredskill1 as ?#} {, a.requiredskill2 as ?#}
 				{, l.name_loc?d AS `name_loc`}
-			FROM {?_gameobject_questrelation ?#, } {?_aowow_lock ?#, } ?_gameobject_template g
+			FROM {?_gameobject_questrelation ?#, } {'.$UDWBaseconf['aowow']['db'].'.?_aowow_lock ?#, } ?_gameobject_template g
 				{LEFT JOIN (?_locales_gameobject l) ON l.entry=g.entry AND ?d}
 			WHERE 
 				name != ""
diff --git a/opensearch.php b/opensearch.php
index d40b189..6b94e67 100644
--- a/opensearch.php
+++ b/opensearch.php
@@ -54,7 +54,7 @@ function SideByRace($race) {
 // Ищем вещи:
 $rows = $DB->select('
 	SELECT i.entry, ?#, iconname, quality
-	FROM ?_aowow_icons a, ?_item_template i{, ?# l}
+	FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i{, ?# l}
 	WHERE
 		?# LIKE ?
 		AND a.id = i.displayid
diff --git a/quest.php b/quest.php
index 09092b7..de8024b 100644
--- a/quest.php
+++ b/quest.php
@@ -208,7 +208,7 @@ if (!$quest = load_cache(10, intval($id))) {
 
         // TODO: skill localization
         $quest['reqskill'] = array(
-            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_skill WHERE skillID=?d LIMIT 1', $quest['SkillOrClass']),
+            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill WHERE skillID=?d LIMIT 1', $quest['SkillOrClass']),
             'value' => $quest['RequiredSkillValue']
         );
     } elseif ($quest['SkillOrClass'] < 0)
@@ -218,13 +218,13 @@ if (!$quest = load_cache(10, intval($id))) {
     // Требуемые отношения с фракциями, что бы начать квест
     if ($quest['RequiredMinRepFaction'] && $quest['RequiredMinRepValue'])
         $quest['RequiredMinRep'] = array(
-            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMinRepFaction']),
+            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMinRepFaction']),
             'entry' => $quest['RequiredMinRepFaction'],
             'value' => $reputations[$quest['RequiredMinRepValue']]
         );
     if ($quest['RequiredMaxRepFaction'] && $quest['RequiredMaxRepValue'])
         $quest['RequiredMaxRep'] = array(
-            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMaxRepFaction']),
+            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RequiredMaxRepFaction']),
             'entry' => $quest['RequiredMaxRepFaction'],
             'value' => $reputations[$quest['RequiredMaxRepValue']]
         );
@@ -235,7 +235,7 @@ if (!$quest = load_cache(10, intval($id))) {
     if ($quest['SrcSpell']) {
         $tmp = $DB->selectRow('
 			SELECT ?#, s.spellname_loc' . $_SESSION['locale'] . '
-			FROM ?_aowow_spell s, ?_aowow_spellicons si
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons si
 			WHERE
 				s.spellID=?d
 				AND si.id=s.spellicon
@@ -254,7 +254,7 @@ if (!$quest = load_cache(10, intval($id))) {
     if ($quest['RewSpellCast'] > 0 || $quest['RewSpell'] > 0) {
         $tmp = $DB->SelectRow('
 			SELECT ?#, s.spellname_loc' . $_SESSION['locale'] . '
-			FROM ?_aowow_spell s, ?_aowow_spellicons si
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons si
 			WHERE
 				s.spellID=?d
 				AND si.id=s.spellicon
@@ -292,7 +292,7 @@ if (!$quest = load_cache(10, intval($id))) {
             // Спелл
             if ($quest['ReqSpellCast' . $i])
                 $quest['coreqs'][$i]['spell'] = array(
-                    'name' => $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellid=?d LIMIT 1', $quest['ReqSpellCast' . $i]),
+                    'name' => $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellid=?d LIMIT 1', $quest['ReqSpellCast' . $i]),
                     'entry' => $quest['ReqSpellCast' . $i]
                 );
         }
@@ -312,7 +312,7 @@ if (!$quest = load_cache(10, intval($id))) {
     // Фракции необходимые для квеста
     if ($quest['RepObjectiveFaction'] > 0 && $quest['RepObjectiveValue'] > 0) {
         $quest['factionreq'] = array(
-            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RepObjectiveFaction']),
+            'name' => $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factions WHERE factionID=?d LIMIT 1', $quest['RepObjectiveFaction']),
             'entry' => $quest['RepObjectiveFaction'],
             'value' => $reputations[$quest['RepObjectiveValue']]
         );
@@ -325,11 +325,11 @@ if (!$quest = load_cache(10, intval($id))) {
     $rows = $DB->select('
 		SELECT c.entry, c.name, A, H
 			{, l.name_loc?d as `name_loc`}
-		FROM ?quest_relations q, ?_aowow_factiontemplate, ?_creature_template c
+		FROM ?_creature_questrelation q, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 			{LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ?}
 		WHERE
 			q.quest=?d
-			AND c.entry=q.entry
+			AND c.entry=q.id
 			AND factiontemplateID=c.FactionAlliance
 		', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry'], $quest['entry']
     );
@@ -350,11 +350,11 @@ if (!$quest = load_cache(10, intval($id))) {
     $rows = $DB->select('
 		SELECT g.entry, g.name
 			{, l.name_loc?d as `name_loc`}
-		FROM ?_quest_relations q, ?_gameobject_template g
+		FROM ?_gameobject_questrelation q, ?_gameobject_template g
 			{LEFT JOIN (?_locales_gameobject l) ON l.entry = g.entry AND ?}
 		WHERE
 			q.quest=?d
-			AND g.entry=q.entry
+			AND g.entry=q.id
 		', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry']
     );
     if ($rows) {
@@ -370,7 +370,7 @@ if (!$quest = load_cache(10, intval($id))) {
     $rows = $DB->select('
 		SELECT i.name, i.entry, i.quality, LOWER(a.iconname) AS iconname
 			{, l.name_loc?d as `name_loc`}
-		FROM ?_aowow_icons a, ?_item_template i
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i
 			{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?}
 		WHERE
 			startquest = ?d
@@ -391,11 +391,11 @@ if (!$quest = load_cache(10, intval($id))) {
     $rows = $DB->select('
 		SELECT c.entry, c.name, A, H
 			{, l.name_loc?d as `name_loc`}
-		FROM ?_quest_relations q, ?_aowow_factiontemplate, ?_creature_template c
+		FROM ?_creature_questrelation q, '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 			{LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ?}
 		WHERE
 			q.quest=?d
-			AND c.entry=q.entry
+			AND c.entry=q.id
 			AND factiontemplateID=c.FactionAlliance
 		', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry']
     );
@@ -416,11 +416,11 @@ if (!$quest = load_cache(10, intval($id))) {
     $rows = $DB->select('
 		SELECT g.entry, g.name
 			{, l.name_loc?d as `name_loc`}
-		FROM ?_quest_relations q, ?_gameobject_template g
+		FROM ?_gameobject_questrelation q, ?_gameobject_template g
 			{LEFT JOIN (?_locales_gameobject l) ON l.entry = g.entry AND ?}
 		WHERE
 			q.quest=?d
-			AND g.entry=q.entry
+			AND g.entry=q.id
 		', ($_SESSION['locale'] > 0) ? $_SESSION['locale'] : DBSIMPLE_SKIP, ($_SESSION['locale'] > 0) ? 1 : DBSIMPLE_SKIP, $quest['entry']
     );
     if ($rows) {
diff --git a/search.php b/search.php
index 8fba22f..22f8914 100644
--- a/search.php
+++ b/search.php
@@ -57,7 +57,7 @@ if ($_SESSION['locale'] > 0) {
 $rows = $DB->select('
 		SELECT i.?#
 			{, l.name_loc?d AS `name_loc`}
-		FROM ?_aowow_icons a, ?_item_template i
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a, ?_item_template i
 			{LEFT JOIN (?_locales_item l) ON l.entry=i.entry AND ?d}
 		WHERE
 			(i.name LIKE ? {OR i.entry IN (?a)})
@@ -88,7 +88,7 @@ $rows = $DB->select('
 		SELECT ?#, c.entry
 			{, l.name_loc?d AS `name_loc`,
 			l.subname_loc' . ($_SESSION['locale']) . ' AS `subname_loc`}
-		FROM ?_aowow_factiontemplate, ?_creature_template c
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 			{LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ?d}
 		WHERE
 			(name LIKE ?
@@ -160,7 +160,7 @@ foreach ($rows as $numRow => $row)
 // Ищем наборы вещей
 $rows = $DB->select('
 		SELECT *
-		FROM ?_aowow_itemset
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset
 		WHERE name_loc' . $_SESSION['locale'] . ' LIKE ?
 	', $nsearch
 );
@@ -170,7 +170,7 @@ foreach ($rows as $numRow => $row)
 // Ищем спеллы
 $rows = $DB->select('
 		SELECT ?#, spellID
-		FROM ?_aowow_spell s, ?_aowow_spellicons i
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
 		WHERE
 			s.spellname_loc' . $_SESSION['locale'] . ' like ?
 			AND i.id = s.spellicon
diff --git a/spell.php b/spell.php
index 0d3a4d1..470d1d2 100644
--- a/spell.php
+++ b/spell.php
@@ -35,7 +35,7 @@ if (!$spell = load_cache(13, intval($id))) {
     // Данные об спелле:
     $row = $DB->selectRow('
 		SELECT s.*, i.iconname
-		FROM ?_aowow_spell s, ?_aowow_spellicons i
+		FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
 		WHERE
 			s.spellID=?
 			AND i.id = s.spellicon
@@ -57,14 +57,14 @@ if (!$spell = load_cache(13, intval($id))) {
         // Уровень спелла
         $spell['level'] = $row['levelspell'];
         // Дальность
-        $RangeRow = $DB->selectRow('SELECT rangeMin, rangeMax, name_loc' . $_SESSION['locale'] . ' from ?_aowow_spellrange where rangeID=? limit 1', $row['rangeID']);
+        $RangeRow = $DB->selectRow('SELECT rangeMin, rangeMax, name_loc' . $_SESSION['locale'] . ' from '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellrange where rangeID=? limit 1', $row['rangeID']);
         $spell['range'] = '';
         if (($RangeRow['rangeMin'] != $RangeRow['rangeMax']) and ($RangeRow['rangeMin'] != 0))
             $spell['range'] = $RangeRow['rangeMin'] . '-';
         $spell['range'] .= $RangeRow['rangeMax'];
         $spell['rangename'] = $RangeRow['name_loc' . $_SESSION['locale']];
         // Время каста
-        $casttime = $DB->selectCell('SELECT base from ?_aowow_spellcasttimes where id=? limit 1', $row['spellcasttimesID']);
+        $casttime = $DB->selectCell('SELECT base from '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellcasttimes where id=? limit 1', $row['spellcasttimesID']);
         if ($casttime > 0)
             $spell['casttime'] = ($casttime / 1000) . ' ' . $smarty->get_config_vars('seconds');
         else if ($row['ChannelInterruptFlags'])
@@ -75,19 +75,19 @@ if (!$spell = load_cache(13, intval($id))) {
         if ($row['cooldown'] > 0)
             $spell['cooldown'] = $row['cooldown'] / 1000;
         // Время действия спелла
-        $duration = $DB->selectCell('SELECT durationBase FROM ?_aowow_spellduration WHERE durationID=?d LIMIT 1', $row['durationID']);
+        $duration = $DB->selectCell('SELECT durationBase FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellduration WHERE durationID=?d LIMIT 1', $row['durationID']);
         if ($duration > 0)
             $spell['duration'] = ($duration / 1000) . ' ' . $smarty->get_config_vars('seconds');
         else
             $spell['duration'] = '<span class="q0">n/a</span>';
         // Школа спелла
-        $spell['school'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_resistances WHERE id=?d LIMIT 1', $row['resistancesID']);
+        $spell['school'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_resistances WHERE id=?d LIMIT 1', $row['resistancesID']);
         // Тип диспела
         if ($row['dispeltypeID'])
-            $spell['dispel'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spelldispeltype WHERE id=?d LIMIT 1', $row['dispeltypeID']);
+            $spell['dispel'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spelldispeltype WHERE id=?d LIMIT 1', $row['dispeltypeID']);
         // Механика спелла
         if ($row['mechanicID'])
-            $spell['mechanic'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spellmechanic WHERE id=?d LIMIT 1', $row['mechanicID']);
+            $spell['mechanic'] = $DB->selectCell('SELECT name_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellmechanic WHERE id=?d LIMIT 1', $row['mechanicID']);
 
         // Информация о спелле
         $spell['info'] = allspellsinfo2($row, 2);
@@ -99,7 +99,7 @@ if (!$spell = load_cache(13, intval($id))) {
             if ($row['tool' . $j]) {
                 $spell['tools'][$i] = array();
                 // Имя инструмента
-                $tool_row = $DB->selectRow('SELECT ?#, `quality` FROM ?_item_template, ?_aowow_icons WHERE entry=?d AND id=displayid LIMIT 1', $item_cols[0], $row['tool' . $j]);
+                $tool_row = $DB->selectRow('SELECT ?#, `quality` FROM ?_item_template, '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons WHERE entry=?d AND id=displayid LIMIT 1', $item_cols[0], $row['tool' . $j]);
                 $spell['tools'][$i]['name'] = $tool_row['name'];
                 $spell['tools'][$i]['quality'] = $tool_row['quality'];
                 // ID инструмента
@@ -120,7 +120,7 @@ if (!$spell = load_cache(13, intval($id))) {
                 $reagentrow = $DB->selectRow('
 					SELECT c.?#, name
 					{ ,l.name_loc?d as `name_loc` }
-					FROM ?_aowow_icons, ?_item_template c
+					FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 					{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
 					WHERE
 						c.entry=?d
@@ -168,7 +168,7 @@ if (!$spell = load_cache(13, intval($id))) {
                             }
                         // скиллы
                         case 118: {// "Require Skill"
-                                $spell['effect'][$i]['name'] .= ' (' . $DB->selectCell('SELECT name FROM ?_aowow_skill WHERE skillID=? LIMIT 1', $row['effect' . $j . 'MiscValue']) . ')';
+                                $spell['effect'][$i]['name'] .= ' (' . $DB->selectCell('SELECT name FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill WHERE skillID=? LIMIT 1', $row['effect' . $j . 'MiscValue']) . ')';
                                 break;
                             }
                         // ауры
@@ -194,7 +194,7 @@ if (!$spell = load_cache(13, intval($id))) {
                     $spell['effect'][$i]['name'] .= ' (' . $spell['school'] . ')';
                 // Радиус действия эффекта
                 if ($row['effect' . $j . 'radius'])
-                    $spell['effect'][$i]['radius'] = $DB->selectCell("SELECT radiusbase from ?_aowow_spellradius where radiusID=? limit 1", $row['effect' . $j . 'radius']);
+                    $spell['effect'][$i]['radius'] = $DB->selectCell('SELECT radiusbase from '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellradius where radiusID=? limit 1', $row['effect' . $j . 'radius']);
                 // Значение спелла (урон)
                 if ($row['effect' . $j . 'BasePoints'] && !$row['effect' . $j . 'itemtype'])
                     $spell['effect'][$i]['value'] = $row['effect' . $j . 'BasePoints'] + 1;
@@ -224,7 +224,7 @@ if (!$spell = load_cache(13, intval($id))) {
                     $tmpRow = $DB->selectRow('
 							SELECT c.?#, name
 							{ ,l.name_loc?d as `name_loc` }
-							FROM ?_aowow_icons, ?_item_template c
+							FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 							{ LEFT JOIN (?_locales_item l) ON l.entry=c.entry AND ? }
 							WHERE
 								c.entry=?d
@@ -244,7 +244,7 @@ if (!$spell = load_cache(13, intval($id))) {
                 if ($row['effect' . $j . 'triggerspell'] > 0) {
                     $spell['effect'][$i]['spell'] = array();
                     $spell['effect'][$i]['spell']['entry'] = $row['effect' . $j . 'triggerspell'];
-                    $spell['effect'][$i]['spell']['name'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM ?_aowow_spell WHERE spellID=?d LIMIT 1', $spell['effect'][$i]['spell']['entry']);
+                    $spell['effect'][$i]['spell']['name'] = $DB->selectCell('SELECT spellname_loc' . $_SESSION['locale'] . ' FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell WHERE spellID=?d LIMIT 1', $spell['effect'][$i]['spell']['entry']);
                     allspellsinfo($spell['effect'][$i]['spell']['entry']);
                 }
                 $i++;
@@ -257,7 +257,7 @@ if (!$spell = load_cache(13, intval($id))) {
         // Спеллы с таким же названием
         $seealso = $DB->select('
 			SELECT s.*, i.iconname
-			FROM ?_aowow_spell s, ?_aowow_spellicons i
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
 			WHERE
 				s.spellname_loc' . $_SESSION['locale'] . ' = ?
 				AND s.spellID <> ?d
@@ -282,7 +282,7 @@ if (!$spell = load_cache(13, intval($id))) {
         $taughtbytrainers = $DB->select('
 			SELECT ?#, c.entry
 			{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
-			FROM ?_aowow_factiontemplate, ?_creature_template c
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 			{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
 			WHERE
 				c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell=?d)
@@ -300,7 +300,7 @@ if (!$spell = load_cache(13, intval($id))) {
         $taughtbyitem = $DB->select('
 			SELECT ?#, c.entry
 			{ , name_loc?d AS name_loc }
-			FROM ?_aowow_icons, ?_item_template c
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 			{ LEFT JOIN (?_locales_item l) ON c.entry = l.entry AND ? }
 			WHERE
 				((spellid_2=?d)
@@ -317,7 +317,7 @@ if (!$spell = load_cache(13, intval($id))) {
         // Список спеллов, обучающих этому спеллу:
         $taughtbyspells = $DB->selectCol('
 			SELECT spellID
-			FROM ?_aowow_spell
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell
 			WHERE
 				(effect1triggerspell=?d AND (effect1id=57 OR effect1id=36))
 				OR (effect2triggerspell=?d AND (effect2id=57 OR effect2id=36))
@@ -330,7 +330,7 @@ if (!$spell = load_cache(13, intval($id))) {
             $taughtbypets = $DB->select('
 				SELECT ?#, c.entry
 				{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
-				FROM ?_aowow_factiontemplate, ?_creature_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 				{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
 				WHERE
 					c.entry IN (SELECT entry FROM ?_petcreateinfo_spell WHERE (Spell1 IN (?a)) OR (Spell2 IN (?a)) OR (Spell3 IN (?a)) OR (Spell4 IN (?a)))
@@ -365,7 +365,7 @@ if (!$spell = load_cache(13, intval($id))) {
             $taughtbytrainers = $DB->select('
 				SELECT ?#, c.entry
 				{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
-				FROM ?_aowow_factiontemplate, ?_creature_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 				{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
 				WHERE
 					c.entry IN (SELECT entry FROM ?_npc_trainer WHERE spell in (?a))
@@ -382,7 +382,7 @@ if (!$spell = load_cache(13, intval($id))) {
             $taughtbyitem = $DB->select('
 				SELECT ?#, c.entry
 				{ , name_loc?d AS name_loc }
-				FROM ?_aowow_icons, ?_item_template c
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 				{ LEFT JOIN (?_locales_item l) ON c.entry = l.entry AND ? }
 				WHERE
 					((spellid_1 IN (?a))
@@ -404,7 +404,7 @@ if (!$spell = load_cache(13, intval($id))) {
         $usedbynpc = $DB->select('
 			SELECT ?#, c.entry
 			{ , name_loc?d AS name_loc, subname_loc' . $_SESSION['locale'] . ' AS subname_loc }
-			FROM ?_aowow_factiontemplate, ?_creature_template c
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c
 			{ LEFT JOIN (?_locales_creature l) ON c.entry = l.entry AND ? }
 			WHERE
 				factiontemplateID=FactionAlliance
@@ -421,7 +421,7 @@ if (!$spell = load_cache(13, intval($id))) {
         $usedbyitem = $DB->select('
 			SELECT ?#, c.entry
 			{ , name_loc?d AS name_loc }
-			FROM ?_aowow_icons, ?_item_template c
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons, ?_item_template c
 			{ LEFT JOIN (?_locales_item l) ON c.entry = l.entry AND ? }
 			WHERE
 				(spellid_1=?d OR (spellid_2=?d AND spelltrigger_2!=6) OR spellid_3=?d OR spellid_4=?d OR spellid_5=?d)
@@ -438,7 +438,7 @@ if (!$spell = load_cache(13, intval($id))) {
         // Используется наборами вещей:
         $usedbyitemset = $DB->select('
 			SELECT *
-			FROM ?_aowow_itemset
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset
 			WHERE spell1=?d or spell2=?d or spell3=?d or spell4=?d or spell5=?d or spell6=?d or spell7=?d or spell8=?d
 			', $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry'], $spell['entry']
         );
diff --git a/spells.php b/spells.php
index 758928a..5319aaa 100644
--- a/spells.php
+++ b/spells.php
@@ -31,7 +31,7 @@ if (!$spells = load_cache(15, $cache_str)) {
         // Классовые
         $rows = $DB->select('
 				SELECT ?#, s.`spellID`, sk.skillID
-				FROM ?_aowow_spell s, ?_aowow_skill_line_ability sla, ?_aowow_spellicons i, ?_aowow_skill sk
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability sla, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill sk
 				WHERE
 					s.spellID = sla.spellID
 					AND s.levelspell >= 1
@@ -70,7 +70,7 @@ if (!$spells = load_cache(15, $cache_str)) {
 			SELECT
 				?#, `s`.`spellID`,
 				sla.skillID, sla.min_value, sla.max_value
-			FROM ?_aowow_spell s, ?_aowow_skill_line_ability sla, ?_aowow_spellicons i, ?_aowow_skill sk
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability sla, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill sk
 			WHERE
 				s.spellID = sla.spellID
 				AND i.id=s.spellicon
@@ -89,7 +89,7 @@ if (!$spells = load_cache(15, $cache_str)) {
         $rows = $DB->select('
 				SELECT
 					?#, `s`.`spellID`, sk.skillID
-				FROM ?_aowow_spell s, ?_aowow_skill_line_ability sla, ?_aowow_spellicons i, ?_aowow_skill sk
+				FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability sla, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i, '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill sk
 				WHERE
 					s.spellID = sla.spellID
 					AND s.levelspell > 0
@@ -108,9 +108,9 @@ if (!$spells = load_cache(15, $cache_str)) {
         $rows = $DB->select('
 			SELECT
 				?#, `s`.`spellID`
-			FROM ?_aowow_spell s, ?_aowow_spellicons i
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
 			WHERE
-				s.spellID IN (SELECT spellID FROM ?_aowow_skill_line_ability WHERE racemask>0)
+				s.spellID IN (SELECT spellID FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_skill_line_ability WHERE racemask>0)
 				AND i.id=s.spellicon
 			{LIMIT ?d}
 			', $spell_cols[2], ($UDWBaseconf['limit'] != 0) ? $UDWBaseconf['limit'] : DBSIMPLE_SKIP
@@ -124,7 +124,7 @@ if (!$spells = load_cache(15, $cache_str)) {
         $rows = $DB->select('
 			SELECT
 				?#, `s`.`spellID`
-			FROM ?_aowow_spell s, ?_aowow_spellicons i
+			FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i
 			WHERE
 				i.id=s.spellicon
 			{LIMIT ?d}
diff --git a/templates/wowhead/js/locale_enus.js b/templates/wowhead/js/locale_enus.js
index 0c58fa7..00d6385 100644
--- a/templates/wowhead/js/locale_enus.js
+++ b/templates/wowhead/js/locale_enus.js
@@ -1,889 +1,969 @@
-var mn_items = [[2, "Weapons", , [[0, "One-Handed Axes"], [1, "Two-Handed Axes"], [2, "Bows"], [3, "Guns"], [4, "One-Handed Maces"], [5, "Two-Handed Maces"], [6, "Polearms"], [7, "One-Handed Swords"], [8, "Two-Handed Swords"], [10, "Staves"], [13, "Fist Weapons"], [14, "Miscellaneous"], [15, "Daggers"], [16, "Thrown"], [18, "Crossbows"], [19, "Wands"], [20, "Fishing Poles"]], , "INV_Sword_27"], [4, "Armor", , [[1, "Cloth" /*, , [[5, "Chest", "?items=4.1&filter=sl=5"], [8, "Feet", "?items=4.1&filter=sl=8"], [10, "Hands", "?items=4.1&filter=sl=10"], [1, "Head", "?items=4.1&filter=sl=1"], [7, "Legs", "?items=4.1&filter=sl=7"], [3, "Shoulder", "?items=4.1&filter=sl=3"], [6, "Waist", "?items=4.1&filter=sl=6"], [9, "Wrist", "?items=4.1&filter=sl=9"]]*/ ], [2, "Leather" /*, , [[5, "Chest", "?items=4.2&filter=sl=5"], [8, "Feet", "?items=4.2&filter=sl=8"], [10, "Hands", "?items=4.2&filter=sl=10"], [1, "Head", "?items=4.2&filter=sl=1"], [7, "Legs", "?items=4.2&filter=sl=7"], [3, "Shoulder", "?items=4.2&filter=sl=3"], [6, "Waist", "?items=4.2&filter=sl=6"], [9, "Wrist", "?items=4.2&filter=sl=9"]]*/ ], [3, "Mail" /*, , [[5, "Chest", "?items=4.3&filter=sl=5"], [8, "Feet", "?items=4.3&filter=sl=8"], [10, "Hands", "?items=4.3&filter=sl=10"], [1, "Head", "?items=4.3&filter=sl=1"], [7, "Legs", "?items=4.3&filter=sl=7"], [3, "Shoulder", "?items=4.3&filter=sl=3"], [6, "Waist", "?items=4.3&filter=sl=6"], [9, "Wrist", "?items=4.3&filter=sl=9"]]*/ ], [4, "Plate" /*, , [[5, "Chest", "?items=4.4&filter=sl=5"], [8, "Feet", "?items=4.4&filter=sl=8"], [10, "Hands", "?items=4.4&filter=sl=10"], [1, "Head", "?items=4.4&filter=sl=1"], [7, "Legs", "?items=4.4&filter=sl=7"], [3, "Shoulder", "?items=4.4&filter=sl=3"], [6, "Waist", "?items=4.4&filter=sl=6"], [9, "Wrist", "?items=4.4&filter=sl=9"]]*/ ], /*[ - 3, "Amulets"], [ - 6, "Cloaks"], [ - 2, "Rings"], [ - 4, "Trinkets"], [ - 5, "Off-hand Frills"],*/ [6, "Shields"], [7, "Librams"], [8, "Idols"], [9, "Totems"], [0, "Miscellaneous"]], , "INV_Chest_Plate16"], [1, "Containers", , [[0, "Bags"], [1, "Soul Bags"], [2, "Herb Bags"], [3, "Enchanting Bags"], [4, "Engineering Bags"], [7, "Leatherworking Bags"]], , "INV_Misc_Bag_13"], [0, "Consumables", , [[0, "Consumables"], [1, "Potions"], [2, "Elixirs", , /*[[1, "Battle"], [2, "Guardian"]]*/ ], [3, "Flasks"], [4, "Scrolls"], [5, "Food & Drinks"], [6, "Permanent Item Enhancements"], /*[ - 3, "Temporary Item Enhancements"],*/ [7, "Bandages"], [8, "Other"]], , "INV_Potion_07"], [7, "Trade Goods", , [[1, "Parts"], [2, "Explosives"], [3, "Devices"], [5, "Cloth"], [6, "Leather"], [7, "Metal & Stone"], [8, "Meat"], [9, "Herbs"], [10, "Elemental"], [12, "Enchanting"], [13, "Material"], [11, "Other"]], , "INV_Gizmo_BronzeFramework_01"], [6, "Projectiles", , [[2, "Arrows"], [3, "Bullets"]], , "INV_Ammo_Bullet_02"], [11, "Quivers", , [[2, "Quivers"], [3, "Ammo Pouches"]], , "INV_Misc_Quiver_08"], [9, "Recipes", , [[0, "Books"], [6, "Alchemy"], [4, "Blacksmithing"], [5, "Cooking"], [8, "Enchanting"], [3, "Engineering"], [7, "First Aid"], [9, "Fishing"], [1, "Leatherworking"], [2, "Tailoring"]], , "INV_Scroll_04"], [15, "Miscellaneous", , [[0, "Junk"], [1, "Reagents"], [3, "Holiday"], /*[ - 4, "Mounts"], [ - 7, "Flying Mounts"], [ - 6, "Combat Pets"],*/ [2, "Small Pets"], /*[ - 2, "Armor Tokens"],*/ [4, "Other"]], , "INV_Qiraj_JewelBlessed"], [12, "Quest", , , , "INV_Misc_Bone_OrcSkull_01"], [13, "Keys", , , , "INV_Misc_Key_04"]];
+var mn_items = [[2, "Weapons", , [[0, "One-Handed Axes"], [1, "Two-Handed Axes"], [2, "Bows"], [3, "Guns"], [4, "One-Handed Maces"], [5, "Two-Handed Maces"], [6, "Polearms"], [7, "One-Handed Swords"], [8, "Two-Handed Swords"], [10, "Staves"], [13, "Fist Weapons"], [14, "Miscellaneous"], [15, "Daggers"], [16, "Thrown"], [18, "Crossbows"], [19, "Wands"], [20, "Fishing Poles"]],, "INV_Sword_27"], [4, "Armor", , [[1, "Cloth"/*, , [[5, "Chest", "?items=4.1&filter=sl=5"], [8, "Feet", "?items=4.1&filter=sl=8"], [10, "Hands", "?items=4.1&filter=sl=10"], [1, "Head", "?items=4.1&filter=sl=1"], [7, "Legs", "?items=4.1&filter=sl=7"], [3, "Shoulder", "?items=4.1&filter=sl=3"], [6, "Waist", "?items=4.1&filter=sl=6"], [9, "Wrist", "?items=4.1&filter=sl=9"]]*/], [2, "Leather"/*, , [[5, "Chest", "?items=4.2&filter=sl=5"], [8, "Feet", "?items=4.2&filter=sl=8"], [10, "Hands", "?items=4.2&filter=sl=10"], [1, "Head", "?items=4.2&filter=sl=1"], [7, "Legs", "?items=4.2&filter=sl=7"], [3, "Shoulder", "?items=4.2&filter=sl=3"], [6, "Waist", "?items=4.2&filter=sl=6"], [9, "Wrist", "?items=4.2&filter=sl=9"]]*/], [3, "Mail"/*, , [[5, "Chest", "?items=4.3&filter=sl=5"], [8, "Feet", "?items=4.3&filter=sl=8"], [10, "Hands", "?items=4.3&filter=sl=10"], [1, "Head", "?items=4.3&filter=sl=1"], [7, "Legs", "?items=4.3&filter=sl=7"], [3, "Shoulder", "?items=4.3&filter=sl=3"], [6, "Waist", "?items=4.3&filter=sl=6"], [9, "Wrist", "?items=4.3&filter=sl=9"]]*/], [4, "Plate"/*, , [[5, "Chest", "?items=4.4&filter=sl=5"], [8, "Feet", "?items=4.4&filter=sl=8"], [10, "Hands", "?items=4.4&filter=sl=10"], [1, "Head", "?items=4.4&filter=sl=1"], [7, "Legs", "?items=4.4&filter=sl=7"], [3, "Shoulder", "?items=4.4&filter=sl=3"], [6, "Waist", "?items=4.4&filter=sl=6"], [9, "Wrist", "?items=4.4&filter=sl=9"]]*/], /*[ - 3, "Amulets"], [ - 6, "Cloaks"], [ - 2, "Rings"], [ - 4, "Trinkets"], [ - 5, "Off-hand Frills"],*/ [6, "Shields"], [7, "Librams"], [8, "Idols"], [9, "Totems"], [0, "Miscellaneous"]],, "INV_Chest_Plate16"], [1, "Containers", , [[0, "Bags"], [1, "Soul Bags"], [2, "Herb Bags"], [3, "Enchanting Bags"], [4, "Engineering Bags"], [5, "Gem Bags"], [6, "Mining Bags"], [7, "Leatherworking Bags"]],, "INV_Misc_Bag_13"], [0, "Consumables", , [[0, "Consumables"], [1, "Potions"], [2, "Elixirs", , /*[[1, "Battle"], [2, "Guardian"]]*/], [3, "Flasks"], [4, "Scrolls"], [5, "Food & Drinks"], [6, "Permanent Item Enhancements"], /*[ - 3, "Temporary Item Enhancements"],*/ [7, "Bandages"], [8, "Other"]],,"INV_Potion_07"], [7, "Trade Goods", , [[1, "Parts"], [2, "Explosives"], [3, "Devices"], [4, "Jewelcrafting"], [5, "Cloth"], [6, "Leather"], [7, "Metal & Stone"], [8, "Meat"], [9, "Herbs"], [10, "Elemental"], [12, "Enchanting"], [13, "Material"], [11, "Other"]],, "INV_Gizmo_BronzeFramework_01"], [6, "Projectiles", , [[2, "Arrows"], [3, "Bullets"]],, "INV_Ammo_Bullet_02"], [11, "Quivers", , [[2, "Quivers"], [3, "Ammo Pouches"]],, "INV_Misc_Quiver_08"], [9, "Recipes", , [[0, "Books"], [6, "Alchemy"], [4, "Blacksmithing"], [5, "Cooking"], [8, "Enchanting"], [3, "Engineering"], [7, "First Aid"], [9, "Fishing"], [10, "Jewelcrafting"], [1, "Leatherworking"], [2, "Tailoring"]],, "INV_Scroll_04"], [3, "Gems", , [[0, "Red "], [1, "Blue"], [2, "Yellow"], [3, "Purple"], [4, "Green"], [5, "Orange"], [6, "Meta"], [7, "Simple"], [8, "Prismatic"]],, "INV_Jewelcrafting_ShadowsongAmethyst_01"], [15, "Miscellaneous", , [[0, "Junk"], [1, "Reagents"], [3, "Holiday"], /*[ - 4, "Mounts"], [ - 7, "Flying Mounts"], [ - 6, "Combat Pets"],*/ [2, "Small Pets"], /*[ - 2, "Armor Tokens"],*/ [4, "Other"]],, "INV_Qiraj_JewelBlessed"], [12, "Quest",,,, "INV_Misc_Bone_OrcSkull_01"], [13, "Keys",,,, "INV_Misc_Key_04"]];
 var mn_itemSets = [[11, "Druid"], [3, "Hunter"], [8, "Mage"], [2, "Paladin"], [5, "Priest"], [4, "Rogue"], [7, "Shaman"], [9, "Warlock"], [1, "Warrior"]];
 var mn_npcs = [[1, "Beasts"], [8, "Critters"], [3, "Demons"], [2, "Dragonkin"], [4, "Elementals"], [5, "Giants"], [7, "Humanoids"], [9, "Mechanicals"], [12, "Small Pets"], [6, "Undead"], [10, "Uncategorized"]];
-var mn_objects = [[9, "Books"], [3, "Containers"], [-5, "Footlockers"], [-3, "Herbs"], [-4, "Mineral Veins"], [-2, "Quest"]];
-var mn_quests = [[0, "Eastern Kingdoms", , [[36, "Alterac Mountains"], [45, "Arathi Highlands"], [3, "Badlands"], [25, "Blackrock Mountain"], [4, "Blasted Lands"], [46, "Burning Steppes"], [41, "Deadwind Pass"], [2257, "Deeprun Tram"], [1, "Dun Morogh"], [10, "Duskwood"], [139, "Eastern Plaguelands"], [12, "Elwynn Forest"], [267, "Hillsbrad Foothills"], [1537, "Ironforge"], [38, "Loch Modan"], [44, "Redridge Mountains"], [51, "Searing Gorge"], [130, "Silverpine Forest"], [1519, "Stormwind City"], [33, "Stranglethorn Vale"], [8, "Swamp of Sorrows"], [47, "The Hinterlands"], [85, "Tirisfal Glades"], [1497, "Undercity"], [28, "Western Plaguelands"], [40, "Westfall"], [11, "Wetlands"]]], [1, "Kalimdor", , [[331, "Ashenvale"], [16, "Azshara"], [148, "Darkshore"], [1657, "Darnassus"], [405, "Desolace"], [14, "Durotar"], [15, "Dustwallow Marsh"], [361, "Felwood"], [357, "Feralas"], [493, "Moonglade"], [215, "Mulgore"], [1637, "Orgrimmar"], [1377, "Silithus"], [406, "Stonetalon Mountains"], [440, "Tanaris"], [141, "Teldrassil"], [17, "The Barrens"], [400, "Thousand Needles"], [1638, "Thunder Bluff"], [1216, "Timbermaw Hold"], [490, "Un'Goro Crater"], [618, "Winterspring"]]], [2, "Dungeons", , [[719, "Blackfathom Deeps"], [1584, "Blackrock Depths"], [1583, "Blackrock Spire"], [2557, "Dire Maul"], [133, "Gnomeregan"], [2100, "Maraudon"], [2437, "Ragefire Chasm"], [722, "Razorfen Downs"], [491, "Razorfen Kraul"], [796, "Scarlet Monastery"], [2057, "Scholomance"], [209, "Shadowfang Keep"], [2017, "Stratholme"], [1581, "The Deadmines"], [717, "The Stockade"], [1337, "Uldaman"], [718, "Wailing Caverns"], [978, "Zul'Farrak"]]], [3, "Raids", , [[2677, "Blackwing Lair"], [2717, "Molten Core"], [3456, "Naxxramas"], [2159, "Onyxia's Lair"], [3429, "Ruins of Ahn'Qiraj"], [3428, "Temple of Ahn'Qiraj"], [19, "Zul'Gurub"]]], [4, "Classes", , [[-263, "Druid"], [-261, "Hunter"], [-161, "Mage"], [-141, "Paladin"], [-262, "Priest"], [-162, "Rogue"], [-82, "Shaman"], [-61, "Warlock"], [-81, "Warrior"]]], [5, "Professions", , [[-181, "Alchemy"], [-121, "Blacksmithing"], [-304, "Cooking"], [-201, "Engineering"], [-324, "First Aid"], [-101, "Fishing"], [-24, "Herbalism"], [-182, "Leatherworking"], [-264, "Tailoring"]]], [6, "Battlegrounds", , [[-25, "All"], [3358, "Arathi Basin"], [2597, "Alterac Valley"], [3277, "Warsong Gulch"]]], [9, "Seasonal", , [[-364, "Darkmoon Faire"], [-1003, "Hallow's End"], [-366, "Lunar Festival"], [-369, "Midsummer Fire Festival"]]], [7, "Miscellaneous", , [[-365, "Ahn'Qiraj War Effort"], [-241, "Argent Tournament"], [-1, "Epic"], [-344, "Legendary"], [-367, "Reputation"]]], [-2, "Uncategorized"]];
-var mn_spells = [[7, "Class Skills", , [[11, "Druid", , [[574, "Balance"], [134, "Feral Combat"], [573, "Restoration"]]], [3, "Hunter", , [[50, "Beast Mastery"], [163, "Marksmanship"], [51, "Survival"]]], [8, "Mage", , [[237, "Arcane"], [8, "Fire"], [6, "Frost"]]], [2, "Paladin", , [[594, "Holy"], [267, "Protection"], [184, "Retribution"]]], [5, "Priest", , [[613, "Discipline"], [56, "Holy"], [78, "Shadow Magic"]]], [4, "Rogue", , [[253, "Assassination"], [38, "Combat"], [633, "Lockpicking"], [39, "Subtlety"]]], [7, "Shaman", , [[375, "Elemental Combat"], [373, "Enhancement"], [374, "Restoration"]]], [9, "Warlock", , [[355, "Affliction"], [354, "Demonology"], [593, "Destruction"]]], [1, "Warrior", , [[26, "Arms"], [256, "Fury"], [257, "Protection"]]]]], [-3, "Pet Skills", , [[782, "Ghoul"], [, "Hunter"], [270, "Generic"], [653, "Bat"], [210, "Bear"], [655, "Bird of Prey"], [211, "Boar"], [213, "Carrion Bird"], [209, "Cat"], [780, "Chimera"], [787, "Core Hound"], [214, "Crab"], [212, "Crocolisk"], [781, "Devilsaur"], [763, "Dragonhawk"], [215, "Gorilla"], [654, "Hyena"], [775, "Moth"], [217, "Raptor"], [767, "Ravager"], [786, "Rhino"], [236, "Scorpid"], [768, "Serpent"], [783, "Silithid"], [203, "Spider"], [788, "Spirit Beast"], [765, "Sporebat"], [218, "Tallstrider"], [251, "Turtle"], [766, "Warp Stalker"], [785, "Wasp"], [656, "Wind Serpent"], [208, "Wolf"], [784, "Worm"], [, "Warlock"], [761, "Felguard"], [189, "Felhunter"], [188, "Imp"], [205, "Succubus"], [204, "Voidwalker"]]], [11, "Professions", , [[171, "Alchemy"], [164, "Blacksmithing", , [[9788, "Armorsmithing"], [9787, "Weaponsmithing"], [17041, "Master Axesmithing"], [17040, "Master Hammersmithing"], [17039, "Master Swordsmithing"]]], [333, "Enchanting"], [202, "Engineering", , [[20219, "Gnomish Engineering"], [20222, "Goblin Engineering"]]], [182, "Herbalism"], [165, "Leatherworking", , [[10656, "Dragonscale Leatherworking"], [10658, "Elemental Leatherworking"], [10660, "Tribal Leatherworking"]]], [186, "Mining"], [393, "Skinning"], [197, "Tailoring", , [[26798, "Mooncloth Tailoring"], [26801, "Shadoweave Tailoring"], [26797, "Spellfire Tailoring"]]]]], [9, "Secondary Skills", , [[185, "Cooking"], [129, "First Aid"], [356, "Fishing"], [762, "Riding"]]], [8, "Armor Proficiencies"], [10, "Languages"], [-4, "Racial Traits"], [6, "Weapon Skills"], [0, "Uncategorized"]];
-var mn_zones = [[0, "Eastern Kingdoms"], [1, "Kalimdor"], [2, "Dungeons"], [3, "Raids"], [6, "Battlegrounds"]];
+var mn_objects = [[9, "Books"], [3, "Containers"], [ - 5, "Footlockers"], [ - 3, "Herbs"], [ - 4, "Mineral Veins"], [ - 2, "Quest"]];
+var mn_quests = [[0, "Eastern Kingdoms", , [[36, "Alterac Mountains"], [45, "Arathi Highlands"], [3, "Badlands"], [25, "Blackrock Mountain"], [4, "Blasted Lands"], [46, "Burning Steppes"], [279, "Dalaran"], [41, "Deadwind Pass"], [2257, "Deeprun Tram"], [1, "Dun Morogh"], [10, "Duskwood"], [139, "Eastern Plaguelands"], [12, "Elwynn Forest"], [3430, "Eversong Woods"], [3433, "Ghostlands"], [267, "Hillsbrad Foothills"], [1537, "Ironforge"], [4080, "Isle of Quel'Danas"], [38, "Loch Modan"], [44, "Redridge Mountains"], [51, "Searing Gorge"], [3487, "Silvermoon City"], [130, "Silverpine Forest"], [1519, "Stormwind City"], [33, "Stranglethorn Vale"], [8, "Swamp of Sorrows"], [47, "The Hinterlands"], [85, "Tirisfal Glades"], [1497, "Undercity"], [28, "Western Plaguelands"], [40, "Westfall"], [11, "Wetlands"]]], [1, "Kalimdor", , [[331, "Ashenvale"], [16, "Azshara"], [3524, "Azuremyst Isle"], [3525, "Bloodmyst Isle"], [148, "Darkshore"], [1657, "Darnassus"], [405, "Desolace"], [14, "Durotar"], [15, "Dustwallow Marsh"], [361, "Felwood"], [357, "Feralas"], [493, "Moonglade"], [215, "Mulgore"], [1637, "Orgrimmar"], [1377, "Silithus"], [406, "Stonetalon Mountains"], [440, "Tanaris"], [141, "Teldrassil"], [17, "The Barrens"], [3557, "The Exodar"], [400, "Thousand Needles"], [1638, "Thunder Bluff"], [1216, "Timbermaw Hold"], [490, "Un'Goro Crater"], [618, "Winterspring"]]], [8, "Outland", , [[3522, "Blade's Edge Mountains"], [3483, "Hellfire Peninsula"], [3518, "Nagrand"], [3523, "Netherstorm"], [3520, "Shadowmoon Valley"], [3703, "Shattrath City"], [3679, "Skettis"], [3519, "Terokkar Forest"], [3521, "Zangarmarsh"]]], [2, "Dungeons", , [[3790, "Auchenai Crypts"], [719, "Blackfathom Deeps"], [1584, "Blackrock Depths"], [1583, "Blackrock Spire"], [1941, "Caverns of Time"], [3905, "Coilfang Reservoir"], [2557, "Dire Maul"], [133, "Gnomeregan"], [3562, "Hellfire Ramparts"], [4095, "Magisters' Terrace"], [3792, "Mana-Tombs"], [2100, "Maraudon"], [2367, "Old Hillsbrad Foothills"], [2437, "Ragefire Chasm"], [722, "Razorfen Downs"], [491, "Razorfen Kraul"], [796, "Scarlet Monastery"], [2057, "Scholomance"], [3791, "Sethekk Halls"], [3789, "Shadow Labyrinth"], [209, "Shadowfang Keep"], [2017, "Stratholme"], [1417, "Sunken Temple"], [3845, "Tempest Keep"], [3846, "The Arcatraz"], [2366, "The Black Morass"], [3713, "The Blood Furnace"], [3847, "The Botanica"], [1581, "The Deadmines"], [3849, "The Mechanar"], [3714, "The Shattered Halls"], [3717, "The Slave Pens"], [3715, "The Steamvault"], [717, "The Stockade"], [3716, "The Underbog"], [1337, "Uldaman"], [718, "Wailing Caverns"], [978, "Zul'Farrak"]]], [3, "Raids", , [[2677, "Blackwing Lair"], [3606, "Hyjal Summit"], [2562, "Karazhan"], [3836, "Magtheridon's Lair"], [2717, "Molten Core"], [3456, "Naxxramas"], [2159, "Onyxia's Lair"], [3429, "Ruins of Ahn'Qiraj"], [3428, "Temple of Ahn'Qiraj"], [3840, "The Black Temple"], [3842, "The Eye"], [3805, "Zul'Aman"], [19, "Zul'Gurub"]]], [4, "Classes", , [[ - 263, "Druid"], [ - 261, "Hunter"], [ - 161, "Mage"], [ - 141, "Paladin"], [ - 262, "Priest"], [ - 162, "Rogue"], [ - 82, "Shaman"], [ - 61, "Warlock"], [ - 81, "Warrior"]]], [5, "Professions", , [[ - 181, "Alchemy"], [ - 121, "Blacksmithing"], [ - 304, "Cooking"], [ - 201, "Engineering"], [ - 324, "First Aid"], [ - 101, "Fishing"], [ - 24, "Herbalism"], [ - 182, "Leatherworking"], [ - 264, "Tailoring"]]], [6, "Battlegrounds", , [[3358, "Arathi Basin"], [2597, "Alterac Valley"], [3820, "Eye of the Storm"], [3277, "Warsong Gulch"]]], [7, "Miscellaneous", , [[ - 365, "Ahn'Qiraj War"], [ - 370, "Brewfest"], [ - 364, "Darkmoon Faire"], [ - 1, "Epic"], [ - 368, "Invasion"], [ - 344, "Legendary"], [ - 366, "Lunar Festival"], [ - 369, "Midsummer"], [ - 367, "Reputation"], [ - 22, "Seasonal"], [ - 284, "Special"], [ - 221, "Treasure Map"]]], [ - 2, "Uncategorized"]];
+var mn_spells = [[7, "Class Skills", , [[11, "Druid", , [[574, "Balance"], [134, "Feral Combat"], [573, "Restoration"]]], [3, "Hunter", , [[50, "Beast Mastery"], [163, "Marksmanship"], [51, "Survival"]]], [8, "Mage", , [[237, "Arcane"], [8, "Fire"], [6, "Frost"]]], [2, "Paladin", , [[594, "Holy"], [267, "Protection"], [184, "Retribution"]]], [5, "Priest", , [[613, "Discipline"], [56, "Holy"], [78, "Shadow Magic"]]], [4, "Rogue", , [[253, "Assassination"], [38, "Combat"], [633, "Lockpicking"], [40, "Poisons"], [39, "Subtlety"]]], [7, "Shaman", , [[375, "Elemental Combat"], [373, "Enhancement"], [374, "Restoration"]]], [9, "Warlock", , [[355, "Affliction"], [354, "Demonology"], [593, "Destruction"]]], [1, "Warrior", , [[26, "Arms"], [256, "Fury"], [257, "Protection"]]]]], /*[ - 2, "Talents", , [[11, "Druid", , [[574, "Balance"], [134, "Feral Combat"], [573, "Restoration"]]], [3, "Hunter", , [[50, "Beast Mastery"], [163, "Marksmanship"], [51, "Survival"]]], [8, "Mage", , [[237, "Arcane"], [8, "Fire"], [6, "Frost"]]], [2, "Paladin", , [[594, "Holy"], [267, "Protection"], [184, "Retribution"]]], [5, "Priest", , [[613, "Discipline"], [56, "Holy"], [78, "Shadow"]]], [4, "Rogue", , [[253, "Assassination"], [38, "Combat"], [39, "Subtlety"]]], [7, "Shaman", , [[375, "Elemental Combat"], [373, "Enhancement"], [374, "Restoration"]]], [9, "Warlock", , [[355, "Affliction"], [354, "Demonology"], [593, "Destruction"]]], [1, "Warrior", , [[26, "Arms"], [256, "Fury"], [257, "Protection"]]]]],*/ [ - 3, "Pet Skills", , [[, "Hunter"], [270, "Generic"], [653, "Bat"], [210, "Bear"], [211, "Boar"], [213, "Carrion Bird"], [209, "Cat"], [214, "Crab"], [212, "Crocolisk"], [763, "Dragonhawk"], [215, "Gorilla"], [654, "Hyena"], [764, "Nether Ray"], [655, "Owl"], [217, "Raptor"], [767, "Ravager"], [236, "Scorpid"], [768, "Serpent"], [203, "Spider"], [218, "Tallstrider"], [251, "Turtle"], [766, "Warp Stalker"], [656, "Wind Serpent"], [208, "Wolf"], [, "Warlock"], [761, "Felguard"], [189, "Felhunter"], [188, "Imp"], [205, "Succubus"], [204, "Voidwalker"]]], [11, "Professions", , [[171, "Alchemy"], [164, "Blacksmithing", , [[9788, "Armorsmithing"], [9787, "Weaponsmithing"], [17041, "Master Axesmithing"], [17040, "Master Hammersmithing"], [17039, "Master Swordsmithing"]]], [333, "Enchanting"], [202, "Engineering", , [[20219, "Gnomish Engineering"], [20222, "Goblin Engineering"]]], [182, "Herbalism"], [755, "Jewelcrafting"], [165, "Leatherworking", , [[10656, "Dragonscale Leatherworking"], [10658, "Elemental Leatherworking"], [10660, "Tribal Leatherworking"]]], [186, "Mining"], [393, "Skinning"], [197, "Tailoring", , [[26798, "Mooncloth Tailoring"], [26801, "Shadoweave Tailoring"], [26797, "Spellfire Tailoring"]]]]], [9, "Secondary Skills", , [[185, "Cooking"], [129, "First Aid"], [356, "Fishing"], [762, "Riding"]]], [6, "Weapon Skills"], [8, "Armor Proficiencies"], [10, "Languages"], [ - 4, "Racial Traits"], [0, "Uncategorized"]];
+var mn_zones = [[0, "Eastern Kingdoms"], [1, "Kalimdor"], [8, "Outland"], [2, "Dungeons"], [3, "Raids"], [6, "Battlegrounds"], [9, "Arenas"]];
 var mn_talentCalc = [["0", "Druid"], ["c", "Hunter"], ["o", "Mage"], ["s", "Paladin"], ["b", "Priest"], ["f", "Rogue"], ["h", "Shaman"], ["I", "Warlock"], ["L", "Warrior"]];
-var mn_database = [[, "Browse"], [0, "Items", "?items", mn_items], [2, "Item Sets", "?itemsets" ], [4, "NPCs", "?npcs", mn_npcs], [5, "Objects", "?objects", mn_objects], [3, "Quests", "?quests", mn_quests], [1, "Spells", "?spells", mn_spells], /*[6, "Zones", "?zones", mn_zones],*/ [7, "Factions", "?factions"], [, "Utilities"], [30, "Latest Comments", "?latest=comments"] /*, [31, "Latest Screenshots", "?latest=screenshots"] */ ];
-var mn_tools = [ /*[0, "Talent Calculator", "?talent", mn_talentCalc],*/ [1, "Maps", "?maps"]];
-var mn_path = [[0, "Database", , mn_database], [1, "Tools", , mn_tools]];
+var mn_database = [[, "Browse"], [0, "Items", "?items", mn_items], [2, "Item Sets", "?itemsets"/*, mn_itemSets*/], [4, "NPCs", "?npcs", mn_npcs], [5, "Objects", "?objects", mn_objects], [3, "Quests", "?quests", mn_quests], [1, "Spells", "?spells", mn_spells], /*[6, "Zones", "?zones", mn_zones],*/ [7, "Factions", "?factions"], [, "Utilities"], /*[28, "Latest Additions", "?latest=additions"], [29, "Latest Articles", "?latest=articles"],*/ [30, "Latest Comments", "?latest=comments"]/*, [31, "Latest Screenshots", "?latest=screenshots"], [99, "Random Page", "?random"]*/];
+var mn_tools = [/*[0, "Talent Calculator", "?talent", mn_talentCalc],*/ [1, "Maps", "?maps"]];
+var mn_forums = [[, "Boards"], [0, "WoW General"], [16, "Beginners"], [14, "PvE"], [15, "PvP"], [ - 2, "Classes", "", [[18, "Death Knight"], [3, "Druid"], [4, "Hunter"], [6, "Mage"], [7, "Paladin"], [8, "Priest"], [5, "Rogue"], [9, "Shaman"], [10, "Warlock"], [11, "Warrior"]]], [13, "Professions"], [12, "UI & Macros"], [17, "Guild Recruitment"], [2, "Randomness"], [1, "Site Feedback"], [, "Utilities"], [81, "Latest Replies", "?forums&latest-replies"], [80, "Latest Topics", "?forums&latest-topics"], [82, "Unanswered Topics", "?forums&unanswered-topics"]];
+var mn_more = [[, "All About Wowhead"], [0, "About Us & Contact", "?aboutus"], [3, "FAQ", "?faq"], [4, "IRC Channel", "?irc"], [6, "News & Announcements", "?news"], [7, "Under Development", "?underdev"], [2, "Wowhead Client", "?client"], [, "Goodies"], [1, "Contests", "?contests"], [10, "Powered by Wowhead", "?powered"], [9, "Spread Wowhead", "?spread"], [8, "Search Plugins (FF, IE7, ...)", "?searchplugins", , "Search Plugins"], [, "Even More"], [5, "Network Sites", , [[99, "Allakhazam", "http://www.allakhazam.com/", [[99, "Dark Age of Camelot", "http://camelot.allakhazam.com"], [99, "EVE Online", "http://eve.allakhazam.com"], [99, "EverQuest", "http://everquest.allakhazam.com"], [99, "EverQuest II", "http://eq2.allakhazam.com"], [99, "EverQuest Online Adventures", "http://eqoa.allakhazam.com"], [99, "Final Fantasy XI", "http://ffxi.allakhazam.com"], [99, "Lineage II", "http://l2.allakhazam.com"], [99, "Lord of the Rings Online", "http://lotr.allakhazam.com"], [99, "Star Wars Galaxies", "http://swg.allakhazam.com"], [99, "World of Warcraft", "http://wow.allakhazam.com"]]], [99, "MMO Interface", "http://www.mmointerface.com/", [[99, "EverQuest", "http://www.eqinterface.com"], [99, "EverQuest II", "http://www.eq2interface.com"], [99, "Lord of the Rings Online", "http://www.lotrointerface.com"], [99, "Vanguard: Saga of Heroes", "http://www.vginterface.com"], [99, "World of Warcraft", "http://www.wowinterface.com"]]], [99, "Online Gaming Radio", "http://www.onlinegamingradio.com/"], [99, "Thottbot", "http://www.thottbot.com/"]]]];
+var mn_path = [[0, "Database", , mn_database], [1, "Tools", , mn_tools]/*, [3, "Forums", , mn_forums], [2, "More", , mn_more]*/];
 var g_chr_classes = {
-    11: "Druid",
-    3: "Hunter",
-    8: "Mage",
-    2: "Paladin",
-    5: "Priest",
-    4: "Rogue",
-    7: "Shaman",
-    9: "Warlock",
-    1: "Warrior"
+	11: "Druid",
+	3: "Hunter",
+	8: "Mage",
+	2: "Paladin",
+	5: "Priest",
+	4: "Rogue",
+	7: "Shaman",
+	9: "Warlock",
+	1: "Warrior"
 };
 var g_chr_races = {
-    3: "Dwarf",
-    7: "Gnome",
-    1: "Human",
-    4: "Night Elf",
-    2: "Orc",
-    6: "Tauren",
-    8: "Troll",
-    5: "Undead"
+	10: "Blood Elf",
+	11: "Draenei",
+	3: "Dwarf",
+	7: "Gnome",
+	1: "Human",
+	4: "Night Elf",
+	2: "Orc",
+	6: "Tauren",
+	8: "Troll",
+	5: "Undead"
 };
 var g_item_slots = {
-    1: "Head",
-    2: "Neck",
-    3: "Shoulder",
-    4: "Shirt",
-    5: "Chest",
-    6: "Waist",
-    7: "Legs",
-    8: "Feet",
-    9: "Wrist",
-    10: "Hands",
-    11: "Finger",
-    12: "Trinket",
-    13: "One-Hand",
-    14: "Shield",
-    15: "Ranged",
-    16: "Back",
-    17: "Two-Hand",
-    18: "Bag",
-    19: "Tabard",
-    21: "Main Hand",
-    22: "Off Hand",
-    23: "Held In Off-hand",
-    24: "Projectile",
-    25: "Thrown",
-    28: "Relic"
+	1: "Head",
+	2: "Neck",
+	3: "Shoulder",
+	4: "Shirt",
+	5: "Chest",
+	6: "Waist",
+	7: "Legs",
+	8: "Feet",
+	9: "Wrist",
+	10: "Hands",
+	11: "Finger",
+	12: "Trinket",
+	13: "One-Hand",
+	14: "Shield",
+	15: "Ranged",
+	16: "Back",
+	17: "Two-Hand",
+	18: "Bag",
+	19: "Tabard",
+	21: "Main Hand",
+	22: "Off Hand",
+	23: "Held In Off-hand",
+	24: "Projectile",
+	25: "Thrown",
+	28: "Relic"
 };
 var g_item_classes = {
-    5: "Reagent",
-    12: "Quest",
-    13: "Key"
+	5: "Reagent",
+	12: "Quest",
+	13: "Key"
 };
 var g_item_subclasses = {
-    0: {
-        0: "Consumable",
-        1: "Potion",
-        2: "Elixir",
-        3: "Flask",
-        4: "Scroll",
-        5: "Food & Drink",
-        6: "Perm. Enhancement",
-        "-3": "Temp. Enhancement",
-        7: "Bandage",
-        8: "Other (Consumables)"
-    },
-    1: {
-        0: "Bag",
-        1: "Soul Bag",
-        2: "Herb Bag",
-        3: "Enchanting Bag",
-        4: "Engineering Bag",
-        5: "Leatherworking Bag"
-    },
-    2: {
-        0: "One-Handed Axe",
-        1: "Two-Handed Axe",
-        2: "Bow",
-        3: "Gun",
-        4: "One-Handed Mace",
-        5: "Two-Handed Mace",
-        6: "Polearm",
-        7: "One-Handed Sword",
-        8: "Two-Handed Sword",
-        10: "Staff",
-        13: "Fist Weapon",
-        14: "Miscellaneous",
-        15: "Dagger",
-        16: "Thrown",
-        18: "Crossbow",
-        19: "Wand",
-        20: "Fishing Pole"
-    },
-    4: {
-        "-6": "Cloak",
-        "-5": "Off-hand Frill",
-        "-4": "Trinket",
-        "-3": "Amulet",
-        "-2": "Ring",
-        0: "Miscellaneous",
-        1: "Cloth",
-        2: "Leather",
-        3: "Mail",
-        4: "Plate",
-        6: "Shield",
-        7: "Libram",
-        8: "Idol",
-        9: "Totem"
-    },
-    6: {
-        2: "Arrow",
-        3: "Bullet"
-    },
-    7: {
-        1: "Part",
-        2: "Explosive",
-        3: "Device",
-        5: "Cloth",
-        6: "Leather",
-        7: "Metal & Stone",
-        8: "Meat",
-        9: "Herb",
-        10: "Elemental",
-        12: "Enchanting",
-        11: "Other (Trade Goods)"
-    },
-    9: {
-        0: "Book",
-        1: "Leatherworking",
-        2: "Tailoring",
-        3: "Engineering",
-        4: "Blacksmithing",
-        5: "Cooking",
-        6: "Alchemy",
-        7: "First Aid",
-        8: "Enchanting",
-        9: "Fishing",
-    },
-    11: {
-        2: "Quiver",
-        3: "Ammo Pouch"
-    },
-    15: {
-        "-6": "Combat Pet",
-        "-4": "Mount",
-        "-2": "Armor Token",
-        0: "Junk",
-        1: "Reagent",
-        2: "Small Pet",
-        3: "Holiday",
-        4: "Other (Miscellaneous)"
-    }
+	0: {
+		0: "Consumable",
+		1: "Potion",
+		2: "Elixir",
+		3: "Flask",
+		4: "Scroll",
+		5: "Food & Drink",
+		6: "Perm. Enhancement",
+		"-3": "Temp. Enhancement",
+		7: "Bandage",
+		8: "Other (Consumables)"
+	},
+	1: {
+		0: "Bag",
+		1: "Soul Bag",
+		2: "Herb Bag",
+		3: "Enchanting Bag",
+		4: "Engineering Bag",
+		5: "Gem Bag",
+		6: "Mining Bag",
+		7: "Leatherworking Bag"
+	},
+	2: {
+		0: "One-Handed Axe",
+		1: "Two-Handed Axe",
+		2: "Bow",
+		3: "Gun",
+		4: "One-Handed Mace",
+		5: "Two-Handed Mace",
+		6: "Polearm",
+		7: "One-Handed Sword",
+		8: "Two-Handed Sword",
+		10: "Staff",
+		13: "Fist Weapon",
+		14: "Miscellaneous",
+		15: "Dagger",
+		16: "Thrown",
+		18: "Crossbow",
+		19: "Wand",
+		20: "Fishing Pole"
+	},
+	3: {
+		0: "Red Gem",
+		1: "Blue Gem",
+		2: "Yellow Gem",
+		3: "Purple Gem",
+		4: "Green Gem",
+		5: "Orange Gem",
+		6: "Meta Gem",
+		7: "Simple Gem",
+		8: "Prismatic Gem"
+	},
+	4: {
+		"-6": "Cloak",
+		"-5": "Off-hand Frill",
+		"-4": "Trinket",
+		"-3": "Amulet",
+		"-2": "Ring",
+		0: "Miscellaneous",
+		1: "Cloth",
+		2: "Leather",
+		3: "Mail",
+		4: "Plate",
+		6: "Shield",
+		7: "Libram",
+		8: "Idol",
+		9: "Totem"
+	},
+	6: {
+		2: "Arrow",
+		3: "Bullet"
+	},
+	7: {
+		1: "Part",
+		2: "Explosive",
+		3: "Device",
+		4: "Jewelcrafting",
+		5: "Cloth",
+		6: "Leather",
+		7: "Metal & Stone",
+		8: "Meat",
+		9: "Herb",
+		10: "Elemental",
+		12: "Enchanting",
+		11: "Other (Trade Goods)"
+	},
+	9: {
+		0: "Book",
+		1: "Leatherworking",
+		2: "Tailoring",
+		3: "Engineering",
+		4: "Blacksmithing",
+		5: "Cooking",
+		6: "Alchemy",
+		7: "First Aid",
+		8: "Enchanting",
+		9: "Fishing",
+		10: "Jewelcrafting"
+	},
+	11: {
+		2: "Quiver",
+		3: "Ammo Pouch"
+	},
+	15: {
+		"-7": "Flying Mount",
+		"-6": "Combat Pet",
+		"-4": "Mount",
+		"-2": "Armor Token",
+		0: "Junk",
+		1: "Reagent",
+		2: "Small Pet",
+		3: "Holiday",
+		4: "Other (Miscellaneous)"
+	}
 };
 var g_item_subsubclasses = {
-    0: {
-        2: {
-            1: "Battle Elixir",
-            2: "Guardian Elixir"
-        }
-    }
+	0: {
+		2: {
+			1: "Battle Elixir",
+			2: "Guardian Elixir"
+		}
+	}
 };
 var g_itemset_types = {
-    1: "Cloth",
-    2: "Leather",
-    3: "Mail",
-    4: "Plate",
-    5: "Dagger",
-    6: "Ring",
-    7: "Fist Weapon",
-    8: "One-Handed Axe",
-    9: "One-Handed Mace",
-    10: "One-Handed Sword",
-    11: "Trinket",
-    12: "Amulet"
+	1: "Cloth",
+	2: "Leather",
+	3: "Mail",
+	4: "Plate",
+	5: "Dagger",
+	6: "Ring",
+	7: "Fist Weapon",
+	8: "One-Handed Axe",
+	9: "One-Handed Mace",
+	10: "One-Handed Sword",
+	11: "Trinket",
+	12: "Amulet"
 };
 var g_itemset_notes = {
-    1: "Dungeon Set 1",
-    2: "Dungeon Set 2",
-    3: "Tier 1 Raid Set",
-    4: "Tier 2 Raid Set",
-    5: "Tier 3 Raid Set",
-    6: "Level 60 PvP Rare Set",
-    7: "Level 60 PvP Rare Set (Old)",
-    8: "Level 60 PvP Epic Set",
-    15: "Arathi Basin Set",
-    9: "Ruins of Ahn'Qiraj Set",
-    10: "Temple of Ahn'Qiraj Set",
-    11: "Zul'Gurub Set"
+	1: "Dungeon Set 1",
+	2: "Dungeon Set 2",
+	14: "Dungeon Set 3",
+	3: "Tier 1 Raid Set",
+	4: "Tier 2 Raid Set",
+	5: "Tier 3 Raid Set",
+	12: "Tier 4 Raid Set",
+	13: "Tier 5 Raid Set",
+	18: "Tier 6 Raid Set",
+	6: "Level 60 PvP Rare Set",
+	7: "Level 60 PvP Rare Set (Old)",
+	8: "Level 60 PvP Epic Set",
+	16: "Level 70 PvP Rare Set",
+	21: "Level 70 PvP Rare Set 2",
+	17: "Arena Season 1 Set",
+	19: "Arena Season 2 Set",
+	20: "Arena Season 3 Set",
+	22: "Arena Season 4 Set",
+	15: "Arathi Basin Set",
+	9: "Ruins of Ahn'Qiraj Set",
+	10: "Temple of Ahn'Qiraj Set",
+	11: "Zul'Gurub Set"
 };
 var g_npc_classifications = {
-    0: "Normal",
-    1: "Elite",
-    2: "Rare Elite",
-    3: "Boss",
-    4: "Rare"
+	0: "Normal",
+	1: "Elite",
+	2: "Rare Elite",
+	3: "Boss",
+	4: "Rare"
 };
 var g_npc_types = {
-    1: "Beast",
-    8: "Critter",
-    3: "Demon",
-    4: "Elemental",
-    2: "Dragonkin",
-    5: "Giant",
-    7: "Humanoid",
-    9: "Mechanical",
-    6: "Undead",
-    10: "Uncategorized",
-    12: "Small Pet"
+	1: "Beast",
+	8: "Critter",
+	3: "Demon",
+	4: "Elemental",
+	2: "Dragonkin",
+	5: "Giant",
+	7: "Humanoid",
+	9: "Mechanical",
+	6: "Undead",
+	10: "Uncategorized",
+	12: "Small Pet"
 };
 var g_object_types = {
-    9: "Book",
-    3: "Container",
-    "-5": "Footlocker",
-    "-3": "Herb",
-    "-4": "Mineral Vein",
-    "-2": "Quest"
+	9: "Book",
+	3: "Container",
+	"-5": "Footlocker",
+	"-3": "Herb",
+	"-4": "Mineral Vein",
+	"-2": "Quest"
 };
 var g_reputation_standings = {
-    0: "Hated",
-    1: "Hostile",
-    2: "Unfriendly",
-    3: "Neutral",
-    4: "Friendly",
-    5: "Honored",
-    6: "Revered",
-    7: "Exalted"
+	0: "Hated",
+	1: "Hostile",
+	2: "Unfriendly",
+	3: "Neutral",
+	4: "Friendly",
+	5: "Honored",
+	6: "Revered",
+	7: "Exalted"
 };
 var g_quest_sorts = {
-    1: "Epic",
-    24: "Herbalism",
-    25: "All Battlegrounds",
-    61: "Warlock",
-    81: "Warrior",
-    82: "Shaman",
-    101: "Fishing",
-    121: "Blacksmithing",
-    141: "Paladin",
-    161: "Mage",
-    162: "Rogue",
-    181: "Alchemy",
-    182: "Leatherworking",
-    201: "Engineering",
-    221: "Treasure Map",
-    261: "Hunter",
-    262: "Priest",
-    263: "Druid",
-    264: "Tailoring",
-    284: "Special",
-    304: "Cooking",
-    324: "First Aid",
-    344: "Legendary",
-    364: "Darkmoon Faire",
-    365: "Ahn'Qiraj War Effort",
-    366: "Lunar Festival",
-    367: "Reputation",
-    369: "Midsummer Fire Festival",
-    370: "Brewfest",
-    373: "Jewelcrafting",
-    1001: "Winter Veil",
-    1002: "Children's Week",
-    1003: "Hallow's End",
-    1004: "Love is in the Air",
-    1005: "Harvest Festival",
-    1006: "New Year's Eve"
+	1: "Epic",
+	22: "Seasonal",
+	24: "Herbalism",
+	61: "Warlock",
+	81: "Warrior",
+	82: "Shaman",
+	101: "Fishing",
+	121: "Blacksmithing",
+	141: "Paladin",
+	161: "Mage",
+	162: "Rogue",
+	181: "Alchemy",
+	182: "Leatherworking",
+	201: "Engineering",
+	221: "Treasure Map",
+	261: "Hunter",
+	262: "Priest",
+	263: "Druid",
+	264: "Tailoring",
+	284: "Special",
+	304: "Cooking",
+	324: "First Aid",
+	344: "Legendary",
+	364: "Darkmoon Faire",
+	365: "Ahn'Qiraj War",
+	366: "Lunar Festival",
+	367: "Reputation",
+	368: "Invasion",
+	369: "Midsummer",
+	370: "Brewfest"
 };
 var g_quest_types = {
-    0: "Normal",
-    1: "Group",
-    81: "Dungeon",
-    62: "Raid",
-    41: "PvP",
-    82: "World Event",
-    84: "Escort",
-    85: "Heroic"
+	0: "Normal",
+	1: "Group",
+	81: "Dungeon",
+	62: "Raid",
+	41: "PvP",
+	82: "World Event",
+	84: "Escort",
+	85: "Heroic"
 };
 var g_sides = {
-    1: "Alliance",
-    2: "Horde",
-    3: "Both"
+	1: "Alliance",
+	2: "Horde",
+	3: "Both"
 };
 var g_sources = {
-    1: "Crafted",
-    2: "Drop",
-    3: "PvP",
-    4: "Quest",
-    5: "Vendor",
-    6: "Trainer",
-    7: "Discovery",
-    8: "Redemption"
+	1: "Crafted",
+	2: "Drop",
+	3: "PvP",
+	4: "Quest",
+	5: "Vendor",
+	6: "Trainer",
+	7: "Discovery",
+	8: "Redemption"
 };
 var g_spell_resistances = {
-    0: "Physical",
-    1: "Holy",
-    2: "Fire",
-    3: "Nature",
-    4: "Frost",
-    5: "Shadow",
-    6: "Arcane"
+	0: "Physical",
+	1: "Holy",
+	2: "Fire",
+	3: "Nature",
+	4: "Frost",
+	5: "Shadow",
+	6: "Arcane"
 };
 var g_spell_skills = {
-    6: "Frost",
-    8: "Fire",
-    26: "Arms",
-    38: "Combat",
-    39: "Subtlety",
-    40: "Poisons",
-    43: "Swords",
-    44: "Axes",
-    45: "Bows",
-    46: "Guns",
-    50: "Beast Mastery",
-    51: "Survival",
-    54: "Maces",
-    55: "Two-Handed Swords",
-    56: "Holy",
-    78: "Shadow Magic",
-    95: "Defense",
-    98: "Common",
-    101: "Dwarven",
-    109: "Orcish",
-    111: "Dwarven",
-    113: "Darnassian",
-    115: "Taurahe",
-    118: "Dual Wield",
-    124: "Tauren",
-    125: "Orc",
-    126: "Night Elf",
-    129: "First Aid",
-    134: "Feral Combat",
-    136: "Staves",
-    137: "Thalassian",
-    138: "Draconic",
-    139: "Demon Tongue",
-    140: "Titan",
-    141: "Old Tongue",
-    142: "Survival",
-    148: "Horse Riding",
-    149: "Wolf Riding",
-    150: "Tiger Riding",
-    152: "Ram Riding",
-    155: "Swimming",
-    160: "Two-Handed Maces",
-    162: "Unarmed",
-    163: "Marksmanship",
-    164: "Blacksmithing",
-    165: "Leatherworking",
-    171: "Alchemy",
-    172: "Two-Handed Axes",
-    173: "Daggers",
-    176: "Thrown",
-    182: "Herbalism",
-    183: "GENERIC (DND)",
-    184: "Retribution",
-    185: "Cooking",
-    186: "Mining",
-    188: "Imp",
-    189: "Felhunter",
-    197: "Tailoring",
-    202: "Engineering",
-    203: "Spider",
-    204: "Voidwalker",
-    205: "Succubus",
-    206: "Infernal",
-    207: "Doomguard",
-    208: "Wolf",
-    209: "Cat",
-    210: "Bear",
-    211: "Boar",
-    212: "Crocilisk",
-    213: "Carrion Bird",
-    214: "Crab",
-    215: "Gorilla",
-    217: "Raptor",
-    218: "Tallstrider",
-    220: "Undead",
-    226: "Crossbows",
-    228: "Wands",
-    229: "Polearms",
-    236: "Scorpid",
-    237: "Arcane",
-    251: "Turtle",
-    253: "Assassination",
-    256: "Fury",
-    257: "Protection",
-    261: "Beast Training",
-    267: "Protection",
-    270: "Generic",
-    293: "Plate Mail",
-    313: "Gnomish",
-    315: "Troll",
-    333: "Enchanting",
-    354: "Demonology",
-    355: "Affliction",
-    356: "Fishing",
-    373: "Enhancement",
-    374: "Restoration",
-    375: "Elemental Combat",
-    393: "Skinning",
-    413: "Mail",
-    414: "Leather",
-    415: "Cloth",
-    433: "Shield",
-    473: "Fist Weapons",
-    533: "Raptor Riding",
-    553: "Mechanostrider Piloting",
-    554: "Undead Horsemanship",
-    573: "Restoration",
-    574: "Balance",
-    593: "Destruction",
-    594: "Holy",
-    613: "Discipline",
-    633: "Lockpicking",
-    653: "Bat",
-    654: "Hyena",
-    655: "Bird of Prey",
-    656: "Wind Serpent",
-    673: "Gutterspeak",
-    713: "Kodo Riding",
-    733: "Troll",
-    753: "Gnome",
-    754: "Human",
-    758: "Remote Control",
-    762: "Riding",
+	6: "Frost",
+	8: "Fire",
+	26: "Arms",
+	38: "Combat",
+	39: "Subtlety",
+	40: "Poisons",
+	43: "Swords",
+	44: "Axes",
+	45: "Bows",
+	46: "Guns",
+	50: "Beast Mastery",
+	51: "Survival",
+	54: "Maces",
+	55: "Two-Handed Swords",
+	56: "Holy",
+	78: "Shadow Magic",
+	95: "Defense",
+	98: "Common",
+	101: "Dwarven",
+	109: "Orcish",
+	111: "Dwarven",
+	113: "Darnassian",
+	115: "Taurahe",
+	118: "Dual Wield",
+	124: "Tauren",
+	125: "Orc",
+	126: "Night Elf",
+	129: "First Aid",
+	134: "Feral Combat",
+	136: "Staves",
+	137: "Thalassian",
+	138: "Draconic",
+	139: "Demon Tongue",
+	140: "Titan",
+	141: "Old Tongue",
+	142: "Survival",
+	148: "Horse Riding",
+	149: "Wolf Riding",
+	150: "Tiger Riding",
+	152: "Ram Riding",
+	155: "Swimming",
+	160: "Two-Handed Maces",
+	162: "Unarmed",
+	163: "Marksmanship",
+	164: "Blacksmithing",
+	165: "Leatherworking",
+	171: "Alchemy",
+	172: "Two-Handed Axes",
+	173: "Daggers",
+	176: "Thrown",
+	182: "Herbalism",
+	183: "GENERIC (DND)",
+	184: "Retribution",
+	185: "Cooking",
+	186: "Mining",
+	188: "Imp",
+	189: "Felhunter",
+	197: "Tailoring",
+	202: "Engineering",
+	203: "Spider",
+	204: "Voidwalker",
+	205: "Succubus",
+	206: "Infernal",
+	207: "Doomguard",
+	208: "Wolf",
+	209: "Cat",
+	210: "Bear",
+	211: "Boar",
+	212: "Crocilisk",
+	213: "Carrion Bird",
+	214: "Crab",
+	215: "Gorilla",
+	217: "Raptor",
+	218: "Tallstrider",
+	220: "Undead",
+	226: "Crossbows",
+	228: "Wands",
+	229: "Polearms",
+	236: "Scorpid",
+	237: "Arcane",
+	251: "Turtle",
+	253: "Assassination",
+	256: "Fury",
+	257: "Protection",
+	261: "Beast Training",
+	267: "Protection",
+	270: "Generic",
+	293: "Plate Mail",
+	313: "Gnomish",
+	315: "Troll",
+	333: "Enchanting",
+	354: "Demonology",
+	355: "Affliction",
+	356: "Fishing",
+	373: "Enhancement",
+	374: "Restoration",
+	375: "Elemental Combat",
+	393: "Skinning",
+	413: "Mail",
+	414: "Leather",
+	415: "Cloth",
+	433: "Shield",
+	473: "Fist Weapons",
+	533: "Raptor Riding",
+	553: "Mechanostrider Piloting",
+	554: "Undead Horsemanship",
+	573: "Restoration",
+	574: "Balance",
+	593: "Destruction",
+	594: "Holy",
+	613: "Discipline",
+	633: "Lockpicking",
+	653: "Bat",
+	654: "Hyena",
+	655: "Owl",
+	656: "Wind Serpent",
+	673: "Gutterspeak",
+	713: "Kodo Riding",
+	733: "Troll",
+	753: "Gnome",
+	754: "Human",
+	755: "Jewelcrafting",
+	756: "Blood Elf",
+	758: "Remote Control",
+	759: "Draenei",
+	760: "Draenei",
+	761: "Felguard",
+	762: "Riding",
+	763: "Dragonhawk",
+	764: "Nether Ray",
+	765: "Sporebat",
+	766: "Warp Stalker",
+	767: "Ravager",
+	768: "Serpent",
+	769: "Internal"
 };
 var g_zones = {
-    1: "Dun Morogh",
-    3: "Badlands",
-    4: "Blasted Lands",
-    8: "Swamp of Sorrows",
-    9: "Northshire Valley",
-    10: "Duskwood",
-    11: "Wetlands",
-    12: "Elwynn Forest",
-    14: "Durotar",
-    15: "Dustwallow Marsh",
-    16: "Azshara",
-    17: "The Barrens",
-    19: "Zul'Gurub",
-    24: "Northshire Abbey",
-    25: "Blackrock Mountain",
-    28: "Western Plaguelands",
-    33: "Stranglethorn Vale",
-    35: "Booty Bay",
-    36: "Alterac Mountains",
-    38: "Loch Modan",
-    40: "Westfall",
-    41: "Deadwind Pass",
-    44: "Redridge Mountains",
-    45: "Arathi Highlands",
-    46: "Burning Steppes",
-    47: "The Hinterlands",
-    51: "Searing Gorge",
-    65: "Dragonblight",
-    66: "Zul'Drak",
-    67: "The Storm Peaks",
-    85: "Tirisfal Glades",
-    130: "Silverpine Forest",
-    131: "Kharanos",
-    132: "Coldridge Valley",
-    133: "Gnomeregan",
-    139: "Eastern Plaguelands",
-    141: "Teldrassil",
-    148: "Darkshore",
-    154: "Deathknell",
-    188: "Shadowglen",
-    209: "Shadowfang Keep",
-    210: "Icecrown",
-    215: "Mulgore",
-    220: "Red Cloud Mesa",
-    221: "Camp Narache",
-    267: "Hillsbrad Foothills",
-    279: "Dalaran Crater",
-    331: "Ashenvale",
-    357: "Feralas",
-    361: "Felwood",
-    363: "Valley of Trials",
-    394: "Grizzly Hills",
-    400: "Thousand Needles",
-    405: "Desolace",
-    406: "Stonetalon Mountains",
-    440: "Tanaris",
-    457: "The Veiled Sea",
-    490: "Un'Goro Crater",
-    491: "Razorfen Kraul",
-    493: "Moonglade",
-    495: "Howling Fjord",
-    618: "Winterspring",
-    702: "Rut'theran Village",
-    717: "The Stockade",
-    718: "Wailing Caverns",
-    719: "Blackfathom Deeps",
-    722: "Razorfen Downs",
-    796: "Scarlet Monastery",
-    978: "Zul'Farrak",
-    1116: "Feathermoon Stronghold",
-    1216: "Timbermaw Hold",
-    1337: "Uldaman",
-    1377: "Silithus",
-    1417: "Sunken Temple",
-    1497: "Undercity",
-    1519: "Stormwind City",
-    1537: "Ironforge",
-    1581: "The Deadmines",
-    1583: "Blackrock Spire",
-    1584: "Blackrock Depths",
-    1637: "Orgrimmar",
-    1638: "Thunder Bluff",
-    1657: "Darnassus",
-    1941: "Caverns of Time",
-    2017: "Stratholme",
-    2057: "Scholomance",
-    2079: "Alcaz Island",
-    2100: "Maraudon",
-    2159: "Onyxia's Lair",
-    2257: "Deeprun Tram",
-    2366: "The Black Morass",
-    2367: "Old Hillsbrad Foothills",
-    2437: "Ragefire Chasm",
-    2557: "Dire Maul",
-    2562: "Karazhan",
-    2597: "Alterac Valley",
-    2677: "Blackwing Lair",
-    2717: "Molten Core",
-    2817: "Crystalsong Forest",
-    2917: "Hall of Legends",
-    2918: "Champions' Hall",
-    3277: "Warsong Gulch",
-    3358: "Arathi Basin",
-    3428: "Temple of Ahn'Qiraj",
-    3429: "Ruins of Ahn'Qiraj",
+	1: "Dun Morogh",
+	3: "Badlands",
+	4: "Blasted Lands",
+	8: "Swamp of Sorrows",
+	9: "Northshire Valley",
+	10: "Duskwood",
+	11: "Wetlands",
+	12: "Elwynn Forest",
+	14: "Durotar",
+	15: "Dustwallow Marsh",
+	16: "Azshara",
+	17: "The Barrens",
+	19: "Zul'Gurub",
+	24: "Northshire Abbey",
+	25: "Blackrock Mountain",
+	28: "Western Plaguelands",
+	33: "Stranglethorn Vale",
+	35: "Booty Bay",
+	36: "Alterac Mountains",
+	38: "Loch Modan",
+	40: "Westfall",
+	41: "Deadwind Pass",
+	44: "Redridge Mountains",
+	45: "Arathi Highlands",
+	46: "Burning Steppes",
+	47: "The Hinterlands",
+	51: "Searing Gorge",
+	85: "Tirisfal Glades",
+	130: "Silverpine Forest",
+	131: "Kharanos",
+	132: "Coldridge Valley",
+	133: "Gnomeregan",
+	139: "Eastern Plaguelands",
+	141: "Teldrassil",
+	148: "Darkshore",
+	154: "Deathknell",
+	188: "Shadowglen",
+	209: "Shadowfang Keep",
+	215: "Mulgore",
+	220: "Red Cloud Mesa",
+	221: "Camp Narache",
+	267: "Hillsbrad Foothills",
+	279: "Dalaran",
+	331: "Ashenvale",
+	357: "Feralas",
+	361: "Felwood",
+	363: "Valley of Trials",
+	400: "Thousand Needles",
+	405: "Desolace",
+	406: "Stonetalon Mountains",
+	440: "Tanaris",
+	457: "The Veiled Sea",
+	490: "Un'Goro Crater",
+	491: "Razorfen Kraul",
+	493: "Moonglade",
+	618: "Winterspring",
+	702: "Rut'theran Village",
+	717: "The Stockade",
+	718: "Wailing Caverns",
+	719: "Blackfathom Deeps",
+	722: "Razorfen Downs",
+	796: "Scarlet Monastery",
+	978: "Zul'Farrak",
+	1116: "Feathermoon Stronghold",
+	1216: "Timbermaw Hold",
+	1337: "Uldaman",
+	1377: "Silithus",
+	1417: "Sunken Temple",
+	1497: "Undercity",
+	1519: "Stormwind City",
+	1537: "Ironforge",
+	1581: "The Deadmines",
+	1583: "Blackrock Spire",
+	1584: "Blackrock Depths",
+	1637: "Orgrimmar",
+	1638: "Thunder Bluff",
+	1657: "Darnassus",
+	1941: "Caverns of Time",
+	2017: "Stratholme",
+	2057: "Scholomance",
+	2079: "Alcaz Island",
+	2100: "Maraudon",
+	2159: "Onyxia's Lair",
+	2257: "Deeprun Tram",
+	2366: "The Black Morass",
+	2367: "Old Hillsbrad Foothills",
+	2437: "Ragefire Chasm",
+	2557: "Dire Maul",
+	2562: "Karazhan",
+	2597: "Alterac Valley",
+	2677: "Blackwing Lair",
+	2717: "Molten Core",
+	2917: "Hall of Legends",
+	2918: "Champions' Hall",
+	3277: "Warsong Gulch",
+	3358: "Arathi Basin",
+	3428: "Temple of Ahn'Qiraj",
+	3429: "Ruins of Ahn'Qiraj",
+	3430: "Eversong Woods",
+	3431: "Sunstrider Isle",
+	3433: "Ghostlands",
+	3456: "Naxxramas",
+	3483: "Hellfire Peninsula",
+	3487: "Silvermoon City",
+	3518: "Nagrand",
+	3519: "Terokkar Forest",
+	3520: "Shadowmoon Valley",
+	3521: "Zangarmarsh",
+	3522: "Blade's Edge Mountains",
+	3523: "Netherstorm",
+	3524: "Azuremyst Isle",
+	3525: "Bloodmyst Isle",
+	3526: "Ammen Vale",
+	3535: "Hellfire Citadel",
+	3557: "The Exodar",
+	3562: "Hellfire Ramparts",
+	3606: "Hyjal Summit",
+	3607: "Serpentshrine Cavern",
+	3618: "Gruul's Lair",
+	3679: "Skettis",
+	3688: "Auchindoun",
+	3696: "The Barrier Hills",
+	3703: "Shattrath City",
+	3713: "The Blood Furnace",
+	3714: "The Shattered Halls",
+	3715: "The Steamvault",
+	3716: "The Underbog",
+	3717: "The Slave Pens",
+	3789: "Shadow Labyrinth",
+	3790: "Auchenai Crypts",
+	3791: "Sethekk Halls",
+	3792: "Mana-Tombs",
+	3805: "Zul'Aman",
+	3820: "Eye of the Storm",
+	3836: "Magtheridon's Lair",
+	3840: "The Black Temple",
+	3842: "The Eye",
+	3845: "Tempest Keep",
+	3846: "The Arcatraz",
+	3847: "The Botanica",
+	3849: "The Mechanar",
+	3905: "Coilfang Reservoir",
+	3959: "Black Temple",
+	4075: "Sunwell Plateau",
+	4080: "Isle of Quel'Danas",
+	4095: "Magisters' Terrace"
 };
 var g_zone_categories = {
-    0: "Eastern Kingdoms",
-    1: "Kalimdor",
-    2: "Dungeons",
-    3: "Raids",
-    6: "Battlegrounds",
+	0: "Eastern Kingdoms",
+	1: "Kalimdor",
+	8: "Outland",
+	2: "Dungeons",
+	3: "Raids",
+	6: "Battlegrounds",
+	9: "Arenas"
 };
 var g_zone_instancetypes = {
-    1: "Transit",
-    2: "Dungeon",
-    3: "Raid",
-    4: "Battleground",
-    5: "Dungeon",
+	1: "Transit",
+	2: "Dungeon",
+	3: "Raid",
+	4: "Battleground",
+	5: "Dungeon",
+	6: "Arena"
 };
 var g_zone_territories = {
-    0: "Alliance",
-    1: "Horde",
-    2: "Contested",
-    3: "Sanctuary",
-    4: "PvP"
+	0: "Alliance",
+	1: "Horde",
+	2: "Contested",
+	3: "Sanctuary",
+	4: "PvP"
 };
 var g_user_roles = {
-    1: "Tester",
-    2: "Administrator",
-    3: "Editor",
-    4: "Moderator",
-    5: "Bureaucrat"
+	1: "Tester",
+	2: "Administrator",
+	3: "Editor",
+	4: "Moderator",
+	5: "Bureaucrat"
 };
 var LANG = {
-    comma: ", ",
-    ellipsis: "...",
-    dash: " " + String.fromCharCode(8211) + " ",
-    hyphen: " - ",
-    colon: ": ",
-    qty: " ($1)",
-    date_on: "on ",
-    date_ago: "$1 ago",
-    date_at: " at ",
-    date_simple: "$2/$1/$3",
-    armor: "Armor",
-    author: "Author",
-    category: "Category",
-    classes: "Classes",
-    cost: "Cost",
-    count: "Count",
-    daily: "Daily",
-    dps: "DPS",
-    group: "Group",
-    instancetype: "Instance type",
-    lastpost: "Last post",
-    level: "Level",
-    location: "Location",
-    name: "Name",
-    react: "React",
-    reagents: "Reagents",
-    rep: "Rep.",
-    req: "Req.",
-    reputation: "Reputation",
-    rewards: "Rewards",
-    petfamily: "Pet family",
-    pieces: "Pieces",
-    posted: "Posted",
-    preview: "Preview",
-    replies: "Replies",
-    school: "School",
-    side: "Side",
-    source: "Source",
-    skill: "Skill",
-    skin: "Skin",
-    slot: "Slot",
-    slots: "Slots",
-    speed: "Speed",
-    stack: "Stack",
-    standing: "Standing",
-    stock: "Stock",
-    subject: "Subject",
-    territory: "Territory",
-    tp: "TP",
-    type: "Type",
-    views: "Views",
-    male: "Male",
-    female: "Female",
-    infobox_noneyet: "None yet &ndash; $1!",
-    infobox_submitone: "Submit one",
-    infobox_showall: "Show all ($1)",
-    lvcomment_add: "Add your comment",
-    lvcomment_sort: "Sort comments by: ",
-    lvcomment_sortdate: "Date",
-    lvcomment_sortrating: "Highest rated first",
-    lvcomment_by: "By ",
-    lvcomment_patch1: " (Patch ",
-    lvcomment_patch2: ")",
-    lvcomment_show: "Show comment",
-    lvcomment_hide: "Hide comment",
-    lvcomment_rating: "Rating: ",
-    lvcomment_lastedit: "Last edited by ",
-    lvcomment_nedits: "edited $1 times",
-    lvcomment_edit: "Edit",
-    lvcomment_delete: "Delete",
-    lvcomment_detach: "Detach",
-    lvcomment_reply: "Reply",
-    lvdrop_outof: "out of $1",
-    lvitem_reqlevel: "Req. ",
-    lvnpc_alliance: "A",
-    lvnpc_horde: "H",
-    lvquest_daily: "Daily $1",
-    lvquest_pickone: "Pick one:",
-    lvquest_alsoget: "Also get:",
-    lvquest_xp: "$1 XP",
-    lvzone_xman: "$1-man",
-    lvzone_xvx: "$1v$2",
-    lvpage_of: " of ",
-    lvpage_first: " First",
-    lvpage_previous: " Previous",
-    lvpage_next: "Next ",
-    lvpage_last: "Last ",
-    lvscreenshot_submit: "Submit a screenshot",
-    lvscreenshot_from: "From ",
-    lvscreenshot_hires: "View",
-    lvscreenshot_hires2: " higher resolution version ($1x$2)",
-    lvnodata: "There is no data to display.",
-    lvnodata_co1: "No comments have been posted yet.",
-    lvnodata_co2: "Be the first to <a>add a comment</a> to this page!",
-    lvnodata_co3: "Please <a>sign in</a> to add your comment, or <a>sign up</a> if you don't already have an account.",
-    lvnodata_ss1: "No screenshots have been submitted yet.",
-    lvnodata_ss2: "Be the first to <a>submit a screenshot</a> for this page!",
-    lvnodata_ss3: "Please <a>sign in</a> to submit a screenshot, or <a>sign up</a> if you don't already have an account.",
-    lvnote_tryfiltering: 'Try <a href="javascript:;" onclick="fi_Toggle()">filtering</a> your results',
-    lvnote_trynarrowing: "Try narrowing your search",
-    lvnote_itemsfound: "$1 items found",
-    lvnote_itemsetsfound: "$1 item sets found",
-    lvnote_npcsfound: "$1 NPCs found",
-    lvnote_objectsfound: "$1 objects found",
-    lvnote_questsfound: "$1 quests found",
-    lvnote_spellsfound: "$1 spells found",
-    lvnote_zonesfound: "$1 zones found",
-    lvnote_factionsfound: "$1 factions found",
-    lvnote_createafilter: '<small><a href="$1">Create a filter</a></small>',
-    lvnote_questgivers: '<small><a href="?zone=$1">View</a> quest givers in <b>$2</b> &nbsp;<b>|</b>&nbsp; <a href="?items&filter=cr=126;crs=$3;crv=0">Filter</a> quest rewards</small>',
-    lvnote_allpets: '<small><a href="?npcs&filter=fa=$1">Browse</a> all available <b>$2</b> pets</small>',
-    lvnote_zonequests: '<small><a href="?quests=$1.$2">Browse quests</a> in the <b>$3</b> category &nbsp;<b>|</b>&nbsp; <a href="?items&filter=cr=126;crs=$4;crv=0">Filter</a> quest rewards</small>',
-    lvnote_itemdisenchanting: "This item has been disenchanted $1 times.",
-    lvnote_itemdropsinnormalonly: "This item only drops in Normal mode.",
-    lvnote_itemdropsinheroiconly: "This item only drops in Heroic mode.",
-    lvnote_itemdropsinnormalheroic: "This item drops in both Normal and Heroic modes.",
-    lvnote_itemopening: "This item has been opened $1 times.",
-    lvnote_itemprospecting: "This mineral ore has been prospected $1 times.",
-    lvnote_npcdrops: "This NPC has been looted $1 times.",
-    lvnote_npcdropsnormal: "This NPC has been looted $1 times in Normal mode.",
-    lvnote_npcdropsheroic: "This NPC has been looted $1 times in Heroic mode.",
-    lvnote_npcherbgathering: "This NPC has been skinned with Herbalism $1 times.",
-    lvnote_npcmining: "This NPC has been skinned with Mining $1 times.",
-    lvnote_npcpickpocketing: "This NPC has been pickpocketed $1 times.",
-    lvnote_npcskinning: "This NPC has been skinned $1 times.",
-    lvnote_objectherbgathering: "This herb has been gathered $1 times.",
-    lvnote_objectmining: "This mineral vein has been mined $1 times.",
-    lvnote_objectopening: "This object has been opened $1 times.",
-    lvnote_objectopeningnormal: "This object has been opened $1 times in Normal mode.",
-    lvnote_objectopeningheroic: "This object has been opened $1 times in Heroic mode.",
-    lvnote_zonefishing: "Waters in this zone have been fished $1 times.",
-    lvnote_usercomments: "This user has posted a total of $1 comments.",
-    lvnote_userscreenshots: "This user has submitted a total of $1 screenshots.",
-    lvnote_usertopics: "This user has posted a total of $1 topics.",
-    lvnote_userreplies: "This user has posted a total of $1 replies.",
-    message_ajaxnotsupported: "Please upgrade to a modern browser (such as Firefox) that supports 'Ajax' requests.",
-    message_codenotentered: "You did not enter the code.",
-    message_cantdeletecomment: "This comment has been automatically purged due to a negative rating. It cannot be deleted.",
-    message_cantdetachcomment: "This comment has already been detached.",
-    message_commentdetached: "This comment is now detached.",
-    message_noscreenshot: "Please select the screenshot to upload.",
-    message_forumposttooshort: "Your post is empty!",
-    message_commenttooshort: "Your comment must be at least 10 characters long.\n\nPlease elaborate a little.",
-    message_descriptiontooshort: "Your description must be at least 10 characters long.\n\nPlease elaborate a little.",
-    message_ingamelink: "Shift-click this to place a link into a chat message: $1",
-    message_entercurrpass: "Please enter your current password.",
-    message_enternewpass: "Please enter your new password.",
-    message_newpassdifferent: "Your new password must be different than your previous one.",
-    message_passwordsdonotmatch: "Passwords do not match.",
-    message_enternewemail: "Please enter your new email address.",
-    message_newemaildifferent: "Your new email address must be different than your previous one.",
-    message_emailnotvalid: "That email address is not valid.",
-    message_enterusername: "Please enter your username.",
-    message_enterpassword: "Please enter your password.",
-    message_enteremail: "Please enter your email address.",
-    message_usernamenotvalid: "Your username can only contain letters and numbers.",
-    message_usernamemin: "Your username must be at least 4 characters long.",
-    message_passwordmin: "Your password must be at least 6 characters long.",
-    message_saved: "Saved.",
-    confirm_deletecomment: "Are you sure that you want to delete this comment?",
-    confirm_detachcomment: "Are you sure that you want to make this comment a standalone one?",
-    confirm_commenttoolong: "Your comment is longer than 7500 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
-    confirm_descriptiontoolong: "Your description is longer than 7500 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
-    confirm_forumposttoolong: "Your post is longer than 7500 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
-    confirm_signaturetoolong: "Your signature is longer than 250 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
-    confirm_signaturetoomanylines: "Your signature contains more than 3 lines and will be truncated.\n\nDo you want to proceed anyway?",
-    prompt_customrating: "Please enter a rating value between -$1 and $2:",
-    prompt_linkurl: "Please enter the URL of your link:",
-    prompt_ratinglevel: "Please enter the level used in the calculation (1 - 70):",
-    prompt_ingamelink: "Copy/paste the following to your in-game chat window:",
-    tooltip_dailyquest: "You may complete up to<br />25 daily quests per day.",
-    tooltip_extendedquestsearch: "Check this option to search in the<br />objectives and description as well.",
-    tooltip_extendedspellsearch: "Check this option to search in the<br />description and buff as well.",
-    tooltip_sellsfor: "Sells for $1",
-    tooltip_zonelink: "Clicking on this link will<br />take you to the zone page.",
-    tooltip_combatrating: "$1&nbsp;@&nbsp;L$2",
-    tooltip_armorbonus: "Has $1 more armor than the default<br />range for this armor type.",
-    tooltip_reqlevel: "Required level",
-    tooltip_repgain: "Reputation gain",
-    tooltip_trainingpoints: "Training points",
-    tooltip_honorpoints: "Honor Points",
-    tooltip_arenapoints: "Arena Points",
-    tooltip_customrating: "Custom rating",
-    tooltip_uprate: "Insightful/funny",
-    tooltip_downrate: "Poor/redundant",
-    tooltip_normal: "Normal",
-    tooltip_sticky: "Sticky",
-    tooltip_pending: "Pending",
-    tooltip_totaldatauploads: "Total size of all data uploads",
-    tooltip_totalratings: "Sum of the ratings of all of their comments",
-    tooltip_avgmoneycontained: "Average money contained",
-    tooltip_avgmoneydropped: "Average money dropped",
-    tooltip_buyoutprice: "Average buyout price (AH)",
-    tooltip_reqenchanting: "Required enchanting skill",
-    tooltip_reqjewelcrafting: "Required jewelcrafting skill",
-    tooltip_reqlockpicking: "Required lockpicking skill",
-    tooltip_partyloot: "When this item drops, each<br />member of the group can loot one.",
-    tooltip_loading: "Loading...",
-    tooltip_noresponse: "No response from server :(",
-    tooltip_itemnotfound: "Item not found :(",
-    tooltip_questnotfound: "Quest not found :(",
-    tooltip_spellnotfound: "Spell not found :(",
-    tooltip_captcha: "Click to generate a new one",
-    tab_items: "Items",
-    tab_itemsets: "Item sets",
-    tab_npcs: "NPCs",
-    tab_objects: "Objects",
-    tab_quests: "Quests",
-    tab_zones: "Zones",
-    tab_abilities: "Abilities",
-    tab_recipes: "Recipes",
-    tab_skills: "Skills",
-    tab_uncategorizedspells: "Uncategorized spells",
-    tab_factions: "Factions",
-    tab_articles: "Articles",
-    tab_bosses: "Bosses",
-    tab_canbeplacedin: "Can be placed in",
-    tab_cancontain: "Can contain",
-    tab_comments: "Comments",
-    tab_containedin: "Contained in",
-    tab_contains: "Contains",
-    tab_createdby: "Created by",
-    tab_currencyfor: "Currency for",
-    tab_disenchantedfrom: "Disenchanted from",
-    tab_disenchanting: "Disenchanting",
-    tab_droppedby: "Dropped by",
-    tab_drops: "Drops",
-    tab_ends: "Ends",
-    tab_fishedin: "Fished in",
-    tab_fishing: "Fishing",
-    tab_gatheredfrom: "Gathered from",
-    tab_herbalism: "Herbalism",
-    tab_heroicdrops: "Heroic drops",
-    tab_latestcomments: "Latest comments",
-    tab_latestreplies: "Latest replies",
-    tab_latestscreenshots: "Latest screenshots",
-    tab_latesttopics: "Latest topics",
-    tab_members: "Members",
-    tab_minedfrom: "Mined from",
-    tab_mining: "Mining",
-    tab_normaldrops: "Normal drops",
-    tab_objectiveof: "Objective of",
-    tab_pickpocketedfrom: "Pickpocketed from",
-    tab_pickpocketing: "Pickpocketing",
-    tab_prospectedfrom: "Prospected from",
-    tab_prospecting: "Prospecting",
-    tab_providedfor: "Provided for",
-    tab_questrewards: "Quest rewards",
-    tab_reagentfor: "Reagent for",
-    tab_replies: "Replies",
-    tab_rewardfrom: "Reward from",
-    tab_samemodelas: "Same model as",
-    tab_screenshots: "Screenshots",
-    tab_seealso: "See also",
-    tab_sharedcooldown: "Shared cooldown",
-    tab_skinnedfrom: "Skinned from",
-    tab_skinning: "Skinning",
-    tab_sells: "Sells",
-    tab_soldby: "Sold by",
-    tab_starts: "Starts",
-    tab_taughtby: "Taught by",
-    tab_teaches: "Teaches",
-    tab_toolfor: "Tool for",
-    tab_topics: "Topics",
-    tab_triggeredby: "Triggered by",
-    tab_unlocks: "Unlocks",
-    tab_usedby: "Used by",
-    tab_addyourcomment: "Add your comment",
-    tab_submitascreenshot: "Submit a screenshot",
-    book_of: " of ",
-    book_previous: " Previous",
-    book_next: "Next ",
-    mapper_tipzoom: "Tip: Click map to zoom",
-    mapper_tippin: "Tip: Click map to add/remove pins",
-    mapper_hidepins: "[hide pins]",
-    mapper_showpins: "[show pins]",
-    showonmap: "Show on map...",
-    som_questgivers: "Quest givers",
-    markup_b: "Bold",
-    markup_i: "Italic",
-    markup_u: "Underline",
-    markup_s: "Strikethrough",
-    markup_small: "Small text",
-    markup_url: "Link",
-    markup_quote: "Quote box",
-    markup_code: "Code box",
-    markup_ul: "Unordered list (bullets)",
-    markup_ol: "Ordered list (numbers)",
-    markup_li: "List item",
-    markup_said: "said:",
-    compose_mode: "Mode:",
-    compose_edit: "Edit",
-    compose_preview: "Preview",
-    compose_livepreview: "Live Preview",
-    compose_save: "Save",
-    compose_cancel: "Cancel",
-    compose_limit: "Up to $1 characters.",
-    compose_limit2: "Up to $1 characters and/or 3 lines.",
-    user_nodescription: "This user hasn't composed one yet.",
-    user_nodescription2: "You haven't composed one yet.",
-    user_composeone: "Compose one now!",
-    user_editdescription: "Edit",
-    myaccount_passmatch: "Passwords match",
-    myaccount_passdontmatch: "Passwords do not match",
-    types: {
-        1: ["NPC", "NPC", "NPCs", "NPCs"],
-        2: ["Object", "object", "Objects", "objects"],
-        3: ["Item", "item", "Items", "items"],
-        4: ["Item Set", "item set", "Item Sets", "item sets"],
-        5: ["Quest", "quest", "Quests", "quests"],
-        6: ["Spell", "spell", "Spells", "spells"],
-        7: ["Zone", "zone", "Zones", "zones"],
-        8: ["Faction", "faction", "Factions", "factions"]
-    },
-    timeunitssg: ["year", "month", "week", "day", "hour", "minute", "second"],
-    timeunitspl: ["years", "months", "weeks", "days", "hours", "minutes", "seconds"],
-    timeunitsab: ["yr", "mo", "wk", "", "hr", "min", "sec"]
+	comma: ", ",
+	ellipsis: "...",
+	dash: " " + String.fromCharCode(8211) + " ",
+	hyphen: " - ",
+	colon: ": ",
+	qty: " ($1)",
+	date_on: "on ",
+	date_ago: "$1 ago",
+	date_at: " at ",
+	date_simple: "$2/$1/$3",
+	armor: "Armor",
+	author: "Author",
+	category: "Category",
+	classes: "Classes",
+	cost: "Cost",
+	count: "Count",
+	daily: "Daily",
+	dps: "DPS",
+	group: "Group",
+	instancetype: "Instance type",
+	lastpost: "Last post",
+	level: "Level",
+	location: "Location",
+	name: "Name",
+	react: "React",
+	reagents: "Reagents",
+	rep: "Rep.",
+	req: "Req.",
+	reputation: "Reputation",
+	rewards: "Rewards",
+	petfamily: "Pet family",
+	pieces: "Pieces",
+	posted: "Posted",
+	preview: "Preview",
+	replies: "Replies",
+	school: "School",
+	side: "Side",
+	source: "Source",
+	skill: "Skill",
+	skin: "Skin",
+	slot: "Slot",
+	slots: "Slots",
+	speed: "Speed",
+	stack: "Stack",
+	standing: "Standing",
+	stock: "Stock",
+	subject: "Subject",
+	territory: "Territory",
+	tp: "TP",
+	type: "Type",
+	views: "Views",
+	male: "Male",
+	female: "Female",
+	infobox_noneyet: "None yet &ndash; $1!",
+	infobox_submitone: "Submit one",
+	infobox_showall: "Show all ($1)",
+	lvcomment_add: "Add your comment",
+	lvcomment_sort: "Sort comments by: ",
+	lvcomment_sortdate: "Date",
+	lvcomment_sortrating: "Highest rated first",
+	lvcomment_by: "By ",
+	lvcomment_patch1: " (Patch ",
+	lvcomment_patch2: ")",
+	lvcomment_show: "Show comment",
+	lvcomment_hide: "Hide comment",
+	lvcomment_rating: "Rating: ",
+	lvcomment_lastedit: "Last edited by ",
+	lvcomment_nedits: "edited $1 times",
+	lvcomment_edit: "Edit",
+	lvcomment_delete: "Delete",
+	lvcomment_detach: "Detach",
+	lvcomment_reply: "Reply",
+	lvdrop_outof: "out of $1",
+	lvitem_reqlevel: "Req. ",
+	lvnpc_alliance: "A",
+	lvnpc_horde: "H",
+	lvquest_daily: "Daily $1",
+	lvquest_pickone: "Pick one:",
+	lvquest_alsoget: "Also get:",
+	lvquest_xp: "$1 XP",
+	lvzone_xman: "$1-man",
+	lvzone_xvx: "$1v$2",
+	lvpage_of: " of ",
+	lvpage_first: " First",
+	lvpage_previous: " Previous",
+	lvpage_next: "Next ",
+	lvpage_last: "Last ",
+	lvscreenshot_submit: "Submit a screenshot",
+	lvscreenshot_from: "From ",
+	lvscreenshot_hires: "View",
+	lvscreenshot_hires2: " higher resolution version ($1x$2)",
+	lvnodata: "There is no data to display.",
+	lvnodata_co1: "No comments have been posted yet.",
+	lvnodata_co2: "Be the first to <a>add a comment</a> to this page!",
+	lvnodata_co3: "Please <a>sign in</a> to add your comment, or <a>sign up</a> if you don't already have an account.",
+	lvnodata_ss1: "No screenshots have been submitted yet.",
+	lvnodata_ss2: "Be the first to <a>submit a screenshot</a> for this page!",
+	lvnodata_ss3: "Please <a>sign in</a> to submit a screenshot, or <a>sign up</a> if you don't already have an account.",
+	lvnote_tryfiltering: 'Try <a href="javascript:;" onclick="fi_Toggle()">filtering</a> your results',
+	lvnote_trynarrowing: "Try narrowing your search",
+	lvnote_itemsfound: "$1 items found",
+	lvnote_itemsetsfound: "$1 item sets found",
+	lvnote_npcsfound: "$1 NPCs found",
+	lvnote_objectsfound: "$1 objects found",
+	lvnote_questsfound: "$1 quests found",
+	lvnote_spellsfound: "$1 spells found",
+	lvnote_zonesfound: "$1 zones found",
+	lvnote_factionsfound: "$1 factions found",
+	lvnote_createafilter: '<small><a href="$1">Create a filter</a></small>',
+	lvnote_questgivers: '<small><a href="?zone=$1">View</a> quest givers in <b>$2</b> &nbsp;<b>|</b>&nbsp; <a href="?items&filter=cr=126;crs=$3;crv=0">Filter</a> quest rewards</small>',
+	lvnote_allpets: '<small><a href="?npcs&filter=fa=$1">Browse</a> all available <b>$2</b> pets</small>',
+	lvnote_zonequests: '<small><a href="?quests=$1.$2">Browse quests</a> in the <b>$3</b> category &nbsp;<b>|</b>&nbsp; <a href="?items&filter=cr=126;crs=$4;crv=0">Filter</a> quest rewards</small>',
+	lvnote_itemdisenchanting: "This item has been disenchanted $1 times.",
+	lvnote_itemdropsinnormalonly: "This item only drops in Normal mode.",
+	lvnote_itemdropsinheroiconly: "This item only drops in Heroic mode.",
+	lvnote_itemdropsinnormalheroic: "This item drops in both Normal and Heroic modes.",
+	lvnote_itemopening: "This item has been opened $1 times.",
+	lvnote_itemprospecting: "This mineral ore has been prospected $1 times.",
+	lvnote_npcdrops: "This NPC has been looted $1 times.",
+	lvnote_npcdropsnormal: "This NPC has been looted $1 times in Normal mode.",
+	lvnote_npcdropsheroic: "This NPC has been looted $1 times in Heroic mode.",
+	lvnote_npcherbgathering: "This NPC has been skinned with Herbalism $1 times.",
+	lvnote_npcmining: "This NPC has been skinned with Mining $1 times.",
+	lvnote_npcpickpocketing: "This NPC has been pickpocketed $1 times.",
+	lvnote_npcskinning: "This NPC has been skinned $1 times.",
+	lvnote_objectherbgathering: "This herb has been gathered $1 times.",
+	lvnote_objectmining: "This mineral vein has been mined $1 times.",
+	lvnote_objectopening: "This object has been opened $1 times.",
+	lvnote_objectopeningnormal: "This object has been opened $1 times in Normal mode.",
+	lvnote_objectopeningheroic: "This object has been opened $1 times in Heroic mode.",
+	lvnote_zonefishing: "Waters in this zone have been fished $1 times.",
+	lvnote_usercomments: "This user has posted a total of $1 comments.",
+	lvnote_userscreenshots: "This user has submitted a total of $1 screenshots.",
+	lvnote_usertopics: "This user has posted a total of $1 topics.",
+	lvnote_userreplies: "This user has posted a total of $1 replies.",
+	message_ajaxnotsupported: "Please upgrade to a modern browser (such as Firefox) that supports 'Ajax' requests.",
+	message_codenotentered: "You did not enter the code.",
+	message_cantdeletecomment: "This comment has been automatically purged due to a negative rating. It cannot be deleted.",
+	message_cantdetachcomment: "This comment has already been detached.",
+	message_commentdetached: "This comment is now detached.",
+	message_noscreenshot: "Please select the screenshot to upload.",
+	message_forumposttooshort: "Your post is empty!",
+	message_commenttooshort: "Your comment must be at least 10 characters long.\n\nPlease elaborate a little.",
+	message_descriptiontooshort: "Your description must be at least 10 characters long.\n\nPlease elaborate a little.",
+	message_ingamelink: "Shift-click this to place a link into a chat message: $1",
+	message_entercurrpass: "Please enter your current password.",
+	message_enternewpass: "Please enter your new password.",
+	message_newpassdifferent: "Your new password must be different than your previous one.",
+	message_passwordsdonotmatch: "Passwords do not match.",
+	message_enternewemail: "Please enter your new email address.",
+	message_newemaildifferent: "Your new email address must be different than your previous one.",
+	message_emailnotvalid: "That email address is not valid.",
+	message_enterusername: "Please enter your username.",
+	message_enterpassword: "Please enter your password.",
+	message_enteremail: "Please enter your email address.",
+	message_usernamenotvalid: "Your username can only contain letters and numbers.",
+	message_usernamemin: "Your username must be at least 4 characters long.",
+	message_passwordmin: "Your password must be at least 6 characters long.",
+	message_saved: "Saved.",
+	confirm_deletecomment: "Are you sure that you want to delete this comment?",
+	confirm_detachcomment: "Are you sure that you want to make this comment a standalone one?",
+	confirm_commenttoolong: "Your comment is longer than 7500 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
+	confirm_descriptiontoolong: "Your description is longer than 7500 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
+	confirm_forumposttoolong: "Your post is longer than 7500 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
+	confirm_signaturetoolong: "Your signature is longer than 250 characters and will be truncated after:\n\n$1\n\nDo you want to proceed anyway?",
+	confirm_signaturetoomanylines: "Your signature contains more than 3 lines and will be truncated.\n\nDo you want to proceed anyway?",
+	prompt_customrating: "Please enter a rating value between -$1 and $2:",
+	prompt_linkurl: "Please enter the URL of your link:",
+	prompt_ratinglevel: "Please enter the level used in the calculation (1 - 70):",
+	prompt_ingamelink: "Copy/paste the following to your in-game chat window:",
+	tooltip_dailyquest: "You may complete up to<br />25 daily quests per day.",
+	tooltip_extendedquestsearch: "Check this option to search in the<br />objectives and description as well.",
+	tooltip_extendedspellsearch: "Check this option to search in the<br />description and buff as well.",
+	tooltip_sellsfor: "Sells for $1",
+	tooltip_zonelink: "Clicking on this link will<br />take you to the zone page.",
+	tooltip_combatrating: "$1&nbsp;@&nbsp;L$2",
+	tooltip_armorbonus: "Has $1 more armor than the default<br />range for this armor type.",
+	tooltip_reqlevel: "Required level",
+	tooltip_repgain: "Reputation gain",
+	tooltip_trainingpoints: "Training points",
+	tooltip_honorpoints: "Honor Points",
+	tooltip_arenapoints: "Arena Points",
+	tooltip_customrating: "Custom rating",
+	tooltip_uprate: "Insightful/funny",
+	tooltip_downrate: "Poor/redundant",
+	tooltip_normal: "Normal",
+	tooltip_sticky: "Sticky",
+	tooltip_pending: "Pending",
+	tooltip_totaldatauploads: "Total size of all data uploads",
+	tooltip_totalratings: "Sum of the ratings of all of their comments",
+	tooltip_avgmoneycontained: "Average money contained",
+	tooltip_avgmoneydropped: "Average money dropped",
+	tooltip_buyoutprice: "Average buyout price (AH)",
+	tooltip_reqenchanting: "Required enchanting skill",
+	tooltip_reqjewelcrafting: "Required jewelcrafting skill",
+	tooltip_reqlockpicking: "Required lockpicking skill",
+	tooltip_partyloot: "When this item drops, each<br />member of the group can loot one.",
+	tooltip_loading: "Loading...",
+	tooltip_noresponse: "No response from server :(",
+	tooltip_itemnotfound: "Item not found :(",
+	tooltip_questnotfound: "Quest not found :(",
+	tooltip_spellnotfound: "Spell not found :(",
+	tooltip_captcha: "Click to generate a new one",
+	tab_items: "Items",
+	tab_itemsets: "Item sets",
+	tab_npcs: "NPCs",
+	tab_objects: "Objects",
+	tab_quests: "Quests",
+	tab_zones: "Zones",
+	tab_abilities: "Abilities",
+	tab_recipes: "Recipes",
+	tab_skills: "Skills",
+	tab_uncategorizedspells: "Uncategorized spells",
+	tab_factions: "Factions",
+	tab_articles: "Articles",
+	tab_bosses: "Bosses",
+	tab_canbeplacedin: "Can be placed in",
+	tab_cancontain: "Can contain",
+	tab_comments: "Comments",
+	tab_containedin: "Contained in",
+	tab_contains: "Contains",
+	tab_createdby: "Created by",
+	tab_currencyfor: "Currency for",
+	tab_disenchantedfrom: "Disenchanted from",
+	tab_disenchanting: "Disenchanting",
+	tab_droppedby: "Dropped by",
+	tab_drops: "Drops",
+	tab_ends: "Ends",
+	tab_fishedin: "Fished in",
+	tab_fishing: "Fishing",
+	tab_gatheredfrom: "Gathered from",
+	tab_herbalism: "Herbalism",
+	tab_heroicdrops: "Heroic drops",
+	tab_latestcomments: "Latest comments",
+	tab_latestreplies: "Latest replies",
+	tab_latestscreenshots: "Latest screenshots",
+	tab_latesttopics: "Latest topics",
+	tab_members: "Members",
+	tab_minedfrom: "Mined from",
+	tab_mining: "Mining",
+	tab_normaldrops: "Normal drops",
+	tab_objectiveof: "Objective of",
+	tab_pickpocketedfrom: "Pickpocketed from",
+	tab_pickpocketing: "Pickpocketing",
+	tab_prospectedfrom: "Prospected from",
+	tab_prospecting: "Prospecting",
+	tab_providedfor: "Provided for",
+	tab_questrewards: "Quest rewards",
+	tab_reagentfor: "Reagent for",
+	tab_replies: "Replies",
+	tab_rewardfrom: "Reward from",
+	tab_samemodelas: "Same model as",
+	tab_screenshots: "Screenshots",
+	tab_seealso: "See also",
+	tab_sharedcooldown: "Shared cooldown",
+	tab_skinnedfrom: "Skinned from",
+	tab_skinning: "Skinning",
+	tab_sells: "Sells",
+	tab_soldby: "Sold by",
+	tab_starts: "Starts",
+	tab_taughtby: "Taught by",
+	tab_teaches: "Teaches",
+	tab_toolfor: "Tool for",
+	tab_topics: "Topics",
+	tab_triggeredby: "Triggered by",
+	tab_unlocks: "Unlocks",
+	tab_usedby: "Used by",
+	tab_addyourcomment: "Add your comment",
+	tab_submitascreenshot: "Submit a screenshot",
+	book_of: " of ",
+	book_previous: " Previous",
+	book_next: "Next ",
+	mapper_tipzoom: "Tip: Click map to zoom",
+	mapper_tippin: "Tip: Click map to add/remove pins",
+	mapper_hidepins: "[hide pins]",
+	mapper_showpins: "[show pins]",
+	showonmap: "Show on map...",
+	som_questgivers: "Quest givers",
+	markup_b: "Bold",
+	markup_i: "Italic",
+	markup_u: "Underline",
+	markup_s: "Strikethrough",
+	markup_small: "Small text",
+	markup_url: "Link",
+	markup_quote: "Quote box",
+	markup_code: "Code box",
+	markup_ul: "Unordered list (bullets)",
+	markup_ol: "Ordered list (numbers)",
+	markup_li: "List item",
+	markup_said: "said:",
+	compose_mode: "Mode:",
+	compose_edit: "Edit",
+	compose_preview: "Preview",
+	compose_livepreview: "Live Preview",
+	compose_save: "Save",
+	compose_cancel: "Cancel",
+	compose_limit: "Up to $1 characters.",
+	compose_limit2: "Up to $1 characters and/or 3 lines.",
+	user_nodescription: "This user hasn't composed one yet.",
+	user_nodescription2: "You haven't composed one yet.",
+	user_composeone: "Compose one now!",
+	user_editdescription: "Edit",
+	myaccount_passmatch: "Passwords match",
+	myaccount_passdontmatch: "Passwords do not match",
+	types: {
+		1: ["NPC", "NPC", "NPCs", "NPCs"],
+		2: ["Object", "object", "Objects", "objects"],
+		3: ["Item", "item", "Items", "items"],
+		4: ["Item Set", "item set", "Item Sets", "item sets"],
+		5: ["Quest", "quest", "Quests", "quests"],
+		6: ["Spell", "spell", "Spells", "spells"],
+		7: ["Zone", "zone", "Zones", "zones"],
+		8: ["Faction", "faction", "Factions", "factions"]
+	},
+	timeunitssg: ["year", "month", "week", "day", "hour", "minute", "second"],
+	timeunitspl: ["years", "months", "weeks", "days", "hours", "minutes", "seconds"],
+	timeunitsab: ["yr", "mo", "wk", "", "hr", "min", "sec"]
 };
diff --git a/templates/wowhead/maps.tpl b/templates/wowhead/maps.tpl
index b4dd252..e9050f6 100644
--- a/templates/wowhead/maps.tpl
+++ b/templates/wowhead/maps.tpl
@@ -21,12 +21,16 @@
 <option value="10">Duskwood</option>
 <option value="139">Eastern Plaguelands</option>
 <option value="12">Elwynn Forest</option>
+<option value="3430">Eversong Woods</option>
 
+<option value="3433">Ghostlands</option>
 <option value="267">Hillsbrad Foothills</option>
 <option value="1537">Ironforge</option>
+<option value="4080">Isle of Quel'Danas</option>
 <option value="38">Loch Modan</option>
 <option value="44">Redridge Mountains</option>
 <option value="51">Searing Gorge</option>
+<option value="3487">Silvermoon City</option>
 <option value="130">Silverpine Forest</option>
 
 <option value="1519">Stormwind City</option>
@@ -43,6 +47,8 @@
 <option value="0">Kalimdor</option>
 <option value="331">Ashenvale</option>
 <option value="16">Azshara</option>
+<option value="3524">Azuremyst Isle</option>
+<option value="3525">Bloodmyst Isle</option>
 <option value="148">Darkshore</option>
 <option value="1657">Darnassus</option>
 <option value="405">Desolace</option>
@@ -60,26 +66,52 @@
 <option value="440">Tanaris</option>
 <option value="141">Teldrassil</option>
 <option value="17">The Barrens</option>
+<option value="3557">The Exodar</option>
 <option value="400">Thousand Needles</option>
 <option value="1638">Thunder Bluff</option>
 <option value="490">Un'Goro Crater</option>
 <option value="618">Winterspring</option>
+</select><select onchange="mapperChooseZone(this)" class="zone-picker">
+
+<option value="0">Outland</option>
+<option value="3522">Blade's Edge Mts.</option>
+<option value="3483">Hellfire Peninsula</option>
+<option value="3518">Nagrand</option>
+<option value="3523">Netherstorm</option>
+<option value="3520">Shadowmoon Valley</option>
+<option value="3703">Shattrath City</option>
+<option value="3519">Terokkar Forest</option>
+<option value="3521">Zangarmarsh</option>
+
 </select>
 <div style="padding-bottom: 4px"></div>
 
 <select onchange="mapperChooseZone(this)" class="zone-picker">
 <option value="0">Instances</option>
 <optgroup label="Dungeons">
+<option value="3790">Auch.: Auchenai Crypts</option>
+<option value="3792">Auch.: Mana-Tombs</option>
+<option value="3791">Auch.: Sethekk Halls</option>
+<option value="3789">Auch.: Shadow Labyrinth</option>
 <option value="719">Blackfathom Deeps</option>
 <option value="1584">Blackrock Depths</option>
 
 <option value="1583b">Blackrock Spire (Upper)</option>
+<option value="3717">CFR: The Slave Pens</option>
+<option value="3715">CFR: The Steamvault</option>
+<option value="3716">CFR: The Underbog</option>
+<option value="2367">CoT: Old Hillsbrad Foothills</option>
+<option value="2366">CoT: The Black Morass</option>
 <option value="2557">Dire Maul</option>
 <option value="2557e">&nbsp;- East</option>
 <option value="2557n">&nbsp;- North</option>
 
 <option value="2557w">&nbsp;- West</option>
+<option value="3562">HFC: Hellfire Ramparts</option>
+<option value="3713">HFC: The Blood Furnace</option>
+<option value="3714">HFC: The Shattered Halls</option>
 <option value="133">Gnomeregan</option>
+<option value="4095">Magisters' Terrace</option>
 <option value="2100">Maraudon</option>
 <option value="2437">Ragefire Chasm</option>
 <option value="722">Razorfen Downs</option>
@@ -95,17 +127,28 @@
 <option value="1417">Sunken Temple</option>
 
 <option value="717">The Stockade</option>
+<option value="3846">TK: The Arcatraz</option>
+<option value="3847">TK: The Botanica</option>
+<option value="3849">TK: The Mechanar</option>
+<option value="1337">Uldaman</option>
 <option value="718">Wailing Caverns</option>
 <option value="978">Zul'Farrak</option>
 </optgroup>
 <optgroup label="Raids">
+<option value="3959">Black Temple</option>
 
+<option value="3607">CFR: Serpentshrine Cavern</option>
+<option value="3606">CoT: Hyjal Summit</option>
+<option value="3618">Gruul's Lair</option>
+<option value="3836">HFC: Magtheridon's Lair</option>
 <option value="2717">Molten Core</option>
 <option value="3456">Naxxramas</option>
 <option value="2159">Onyxia's Lair</option>
 <option value="3429">Ruins of Ahn'Qiraj</option>
 <option value="3428">Temple of Ahn'Qiraj</option>
 
+<option value="3842">TK: The Eye</option>
+<option value="3805">Zul'Aman</option>
 <option value="19">Zul'Gurub</option>
 </optgroup>
 </select>
@@ -114,12 +157,16 @@
 <optgroup label="Battlegrounds">
 <option value="2597">Alterac Valley</option>
 <option value="3358">Arathi Basin</option>
+<option value="3820">Eye of the Storm</option>
+
 <option value="3277">Warsong Gulch</option>
 </optgroup>
 <optgroup label="Miscellaneous">
 <option value="-1">Azeroth</option>
 <option value="-3">Eastern Kingdoms</option>
 <option value="457">Kalimdor</option>
+<option value="-2">Outland</option>
+<option value="-4">Cosmic Map</option>
 </optgroup>
 </select>
 
diff --git a/templates/wowhead/quest.tpl b/templates/wowhead/quest.tpl
index 4a14c97..98296ee 100644
--- a/templates/wowhead/quest.tpl
+++ b/templates/wowhead/quest.tpl
@@ -27,7 +27,7 @@
 							{if $quest.MinLevel>0}<li><div>{#Requires_level#}: {$quest.MinLevel}</div></li>{/if}
 							{if $quest.typename}<li><div>{#Type#}: {$quest.typename}</div></li>{/if}
 							{if isset($quest.side)}<li><div>{#Side#}: <span class="{if ($quest.side.side==1)}alliance{elseif ($quest.side.side==2)}horde{else}both{/if}-icon">{$quest.side.name}</span></div></li>{/if}
-							{if isset($quest.start)}<li><div>{#Start#}: {section loop=$quest.start name=i}{if $quest.start[i].side}<span class="{$quest.start[i].side}-icon">{/if}<a href="?{$quest.start[i].type}={$quest.start[i].entry}"{if $quest.start[i].type == 'item'} class="icontiny q{$quest.start[i].quality}" style="background-image: url(images/icons/tiny/{$quest.start[i].iconname}.gif);"{/if}>{$quest.start[i].name}</a>{if $quest.start[i].side}</span>{/if}{if $smarty.section.i.last}{else}, <br><span style="visibility: hidden;">{#Start#}: </span>{/if}{/section}</div></li>{/if}
+							{if isset($quest.start)}<li><div>{#Start#}: {section loop=$quest.start name=i}{if $quest.start[i].side}<span class="{$quest.start[i].side}-icon">{/if}<a href="?{$quest.start[i].type}={$quest.start[i].entry}"{if $quest.start[i].type == 'item'} class="icontiny q{$quest.start[i].quality}" style="background-image: url(images/icons/tiny/{$quest.start[i].iconname}.png);"{/if}>{$quest.start[i].name}</a>{if $quest.start[i].side}</span>{/if}{if $smarty.section.i.last}{else}, <br><span style="visibility: hidden;">{#Start#}: </span>{/if}{/section}</div></li>{/if}
 							{if isset($quest.end)}<li><div>{#End#}: {section loop=$quest.end name=i}{if $quest.end[i].side}<span class="{$quest.start[i].side}-icon">{/if}<a href="?{$quest.end[i].type}={$quest.end[i].entry}">{$quest.end[i].name}</a>{if $quest.end[i].side}</span>{/if}{if $smarty.section.i.last}{else}, <br><span style="visibility: hidden;">{#End#}: </span>{/if}{/section}</div></li>{/if}
 							{if isset($quest.reqskill)}<li><div>{#Skill#}: {$quest.reqskill.name} ({$quest.reqskill.value})</div></li>{/if}
 							{if isset($quest.reqclass)}<li><div>{#Class#}: {$quest.reqclass}</div></li>{/if}