diff --git a/includes/allitems.php b/includes/allitems.php
index a1a1135..f657d12 100644
--- a/includes/allitems.php
+++ b/includes/allitems.php
@@ -15,6 +15,7 @@ require_once('includes/allspells.php');
 require_once('includes/allitemsets.php');
 require_once('includes/allobjects.php');
 require_once('includes/allquests.php');
+require_once('includes/alllocales.php');
 
 // Массивы с названиями столбцов, необходимых для различных уровней вызова функций
 // для allitems($level=0) - соответствия номер-иконка
diff --git a/includes/allquests.php b/includes/allquests.php
index 844bb8f..6dd411d 100644
--- a/includes/allquests.php
+++ b/includes/allquests.php
@@ -60,7 +60,7 @@ $questcols[QUEST_DATAFLAG_MINIMUM] = array('entry', 'Title');
 $questcols[QUEST_DATAFLAG_STRINGS] = array('Objectives', 'Details', 'RequestItemsText', 'OfferRewardText', 'EndText', 'ObjectiveText1', 'ObjectiveText2', 'ObjectiveText3', 'ObjectiveText4');
 $questcols[QUEST_DATAFLAG_REWARDS] = array('RewChoiceItemId1', 'RewChoiceItemId2', 'RewChoiceItemId3', 'RewChoiceItemId4', 'RewChoiceItemId5', 'RewChoiceItemId6', 'RewChoiceItemCount1', 'RewChoiceItemCount2', 'RewChoiceItemCount3', 'RewChoiceItemCount4', 'RewChoiceItemCount5', 'RewChoiceItemCount6', 'RewItemId1', 'RewItemId2', 'RewItemId3', 'RewItemId4', 'RewItemCount1', 'RewItemCount2', 'RewItemCount3', 'RewItemCount4', 'RewMoneyMaxLevel', 'RewOrReqMoney', 'ReqSpellCast1', 'ReqSpellCast2', 'ReqSpellCast3', 'ReqSpellCast4', 'ReqCreatureOrGOId1', 'ReqCreatureOrGOId2', 'ReqCreatureOrGOId3', 'ReqCreatureOrGOId4', 'ReqItemId1', 'ReqItemId2', 'ReqItemId3', 'ReqItemId4', 'ReqItemCount1', 'ReqItemCount2', 'ReqItemCount3', 'ReqItemCount4', 'SrcItemId', 'ReqCreatureOrGOCount1', 'ReqCreatureOrGOCount2', 'ReqCreatureOrGOCount3', 'ReqCreatureOrGOCount4', 'RewSpell', 'RewSpellCast', 'RewRepFaction1', 'RewRepFaction2', 'RewRepFaction3', 'RewRepFaction4', 'RewRepFaction5', 'RewRepValue1', 'RewRepValue2', 'RewRepValue3', 'RewRepValue4', 'RewRepValue5');
 $questcols[QUEST_DATAFLAG_PROPS] = array('Type', 'ZoneOrSort', 'QuestFlags', 'QuestLevel', 'MinLevel', 'RequiredRaces');
-$questcols[QUEST_DATAFLAG_SERIES] = array('PrevQuestID', 'NextQuestInChain', 'ExclusiveGroup', 'NextQuestID');
+$questcols[QUEST_DATAFLAG_SERIES] = array('PrevQuestID', 'NextQuestInChain', 'ExclusiveGroup', 'NextQuestID','SuggestedPlayers', 'LimitTime', 'SpecialFlags', 'CharTitleId');
 
 $quest_cols[2] = array('entry', 'Title', 'QuestLevel', 'MinLevel', 'RequiredRaces', 'RewChoiceItemId1', 'RewChoiceItemId2', 'RewChoiceItemId3', 'RewChoiceItemId4', 'RewChoiceItemId5', 'RewChoiceItemId6', 'RewChoiceItemCount1', 'RewChoiceItemCount2', 'RewChoiceItemCount3', 'RewChoiceItemCount4', 'RewChoiceItemCount5', 'RewChoiceItemCount6', 'RewItemId1', 'RewItemId2', 'RewItemId3', 'RewItemId4', 'RewItemCount1', 'RewItemCount2', 'RewItemCount3', 'RewItemCount4', 'RewMoneyMaxLevel', 'RewOrReqMoney', 'Type', 'ZoneOrSort', 'QuestFlags');
 $quest_cols[3] = array('Title', 'QuestLevel', 'MinLevel', 'RequiredRaces', 'RewChoiceItemId1', 'RewChoiceItemId2', 'RewChoiceItemId3', 'RewChoiceItemId4', 'RewChoiceItemId5', 'RewChoiceItemId6', 'RewChoiceItemCount1', 'RewChoiceItemCount2', 'RewChoiceItemCount3', 'RewChoiceItemCount4', 'RewChoiceItemCount5', 'RewChoiceItemCount6', 'RewItemId1', 'RewItemId2', 'RewItemId3', 'RewItemId4', 'RewItemCount1', 'RewItemCount2', 'RewItemCount3', 'RewItemCount4', 'RewMoneyMaxLevel', 'RewOrReqMoney', 'Type', 'ZoneOrSort', 'QuestFlags', 'RewRepFaction1', 'RewRepFaction2', 'RewRepFaction3', 'RewRepFaction4', 'RewRepFaction5', 'RewRepValue1', 'RewRepValue2', 'RewRepValue3', 'RewRepValue4', 'RewRepValue5', 'Objectives', 'Details', 'RequestItemsText', 'OfferRewardText', 'ReqCreatureOrGOId1', 'ReqCreatureOrGOId2', 'ReqCreatureOrGOId3', 'ReqCreatureOrGOId4', 'ReqItemId1', 'ReqItemId2', 'ReqItemId3', 'ReqItemId4', 'ReqItemCount1', 'ReqItemCount2', 'ReqItemCount3', 'ReqItemCount4', 'SrcItemId', 'ReqCreatureOrGOCount1', 'ReqCreatureOrGOCount2', 'ReqCreatureOrGOCount3', 'ReqCreatureOrGOCount4', 'ObjectiveText1', 'ObjectiveText2', 'ObjectiveText3', 'ObjectiveText4', 'EndText', 'PrevQuestID', 'NextQuestInChain', 'ExclusiveGroup', 'NextQuestID', 'RewSpellCast', 'RewSpell', 'RequiredSkillValue', 'RepObjectiveFaction', 'RepObjectiveValue', 'SuggestedPlayers', 'LimitTime', 'QuestFlags', 'SpecialFlags', 'CharTitleId', 'RequiredMinRepFaction', 'RequiredMinRepValue', 'RequiredMaxRepFaction', 'RequiredMaxRepValue', 'SrcSpell', 'SkillOrClass', 'ReqSpellCast1', 'ReqSpellCast2', 'ReqSpellCast3', 'ReqSpellCast4');
@@ -439,12 +439,12 @@ function GetQuestInfo(&$data, $dataflag = QUEST_DATAFLAG_MINIMUM) {
         // Опыт/деньги@70
         $data['xp'] = GetQuestXpOrMoney($data);
         // Награды вещей
-        for ($j = 0; $j <= 6; ++$j)
+        for ($j = 1; $j <= 6; ++$j)
             if (($data['RewChoiceItemId' . $j] != 0) and ($data['RewChoiceItemCount' . $j] != 0))
                 $data['itemchoices'][] = array_merge(
                         allitemsinfo($data['RewChoiceItemId' . $j], 0), array('count' => $data['RewChoiceItemCount' . $j])
                 );
-        for ($j = 0; $j <= 4; ++$j)
+        for ($j = 1; $j <= 4; ++$j)
             if (($data['RewItemId' . $j] != 0) and ($data['RewItemCount' . $j] != 0))
                 $data['itemrewards'][] = array_merge(
                         allitemsinfo($data['RewItemId' . $j], 0), array('count' => $data['RewItemCount' . $j])
@@ -454,10 +454,10 @@ function GetQuestInfo(&$data, $dataflag = QUEST_DATAFLAG_MINIMUM) {
             if (($data['RewRepFaction' . $j] != 0) && ($data['RewRepValue' . $j] != 0))
                 $data['reprewards'][] = array_merge(factioninfo($data['RewRepFaction' . $j]), array('value' => $data['RewRepValue' . $j]));
         // Вознаграждение деньгами
-        if ($data['money'] > 0)
-            $data['money'] = money2coins($data['money']);
-        elseif ($data['money'] < 0)
-            $data['moneyreq'] = money2coins(-$data['money']);
+        if ($data['RewOrReqMoney'] > 0)
+            $data['money'] = money2coins($data['RewOrReqMoney']);
+        elseif ($data['RewOrReqMoney'] < 0)
+            $data['moneyreq'] = money2coins(-$data['RewOrReqMoney']);
     }
 
     // Последовательность квестов, требования, цепочки
diff --git a/includes/allspells.php b/includes/allspells.php
index 297f091..80a22a3 100644
--- a/includes/allspells.php
+++ b/includes/allspells.php
@@ -948,7 +948,8 @@ function spellinfo($id) {
 function spellinfo2(&$row) {
     global $DB;
     global $item_cols;
-
+    global $UDWBaseconf;
+    
     if ($row) {
         $spell = array();
         $spell['entry'] = $row['spellID'];
diff --git a/templates/wowhead/js/global.js b/templates/wowhead/js/global.js
index 0ad34ca..d8914bf 100644
--- a/templates/wowhead/js/global.js
+++ b/templates/wowhead/js/global.js
@@ -1559,15 +1559,15 @@ Tabs.prototype = {
             if (this.selectedTab != -1) {
                 B[this.selectedTab].className = ""
             }
-            B[C].className = "selected"
+            if(B[C]) B[C].className = "selected"
         }
         B = this.tabs[C];
-        if (B.onLoad) {
+        if (B && B.onLoad) {
             B.onLoad();
             B.onLoad = null
         }
-        this.onShow(this.tabs[C], this.tabs[this.selectedTab]);
-        if (B.onShow) {
+        if(this.tabs[C]) this.onShow(this.tabs[C], this.tabs[this.selectedTab]);
+        if (B && B.onShow) {
             B.onShow(this.tabs[this.selectedTab])
         }
         this.selectedTab = C
diff --git a/templates/wowhead/npc.tpl b/templates/wowhead/npc.tpl
index 2c36732..95b6b65 100644
--- a/templates/wowhead/npc.tpl
+++ b/templates/wowhead/npc.tpl
@@ -107,9 +107,9 @@
 
 			<div id="listview-generic" class="listview"></div>
 <script type="text/javascript">
+var tabsRelated = new Tabs({ldelim}parent: ge('tabs-generic'){rdelim});
 {if isset($allitems)}{include						file='bricks/allitems_table.tpl'  data=$allitems}{/if}
 {if isset($allspells)}{include					file='bricks/allspells_table.tpl' data=$allspells}{/if}
-var tabsRelated = new Tabs({ldelim}parent: ge('tabs-generic'){rdelim});
 {if isset($npc.sells)}{include 					file='bricks/item_table.tpl'	id='sells'						name='sells'					tabsid='tabsRelated' data=$npc.sells}{/if}
 {if isset($npc.drop)}{include 					file='bricks/item_table.tpl'	id='drop'							name='drops'					tabsid='tabsRelated' data=$npc.drop}{/if}
 {if isset($npc.pickpocketing)}{include	file='bricks/item_table.tpl'	id='pick-pocketing'		name='pickpocketing'	tabsid='tabsRelated' data=$npc.pickpocketing}{/if}
diff --git a/templates/wowhead/object.tpl b/templates/wowhead/object.tpl
index cfa8d41..25b1508 100644
--- a/templates/wowhead/object.tpl
+++ b/templates/wowhead/object.tpl
@@ -68,12 +68,12 @@
 <br/>
 				<div id="mapper-generic"></div>
 				<div class="clear"></div>
-{literal}
+
 				<script type="text/javascript">
-					var myMapper = new Mapper({parent: 'mapper-generic', zone: '{$zonedata[0].zone}'});
+					var myMapper = new Mapper({ldelim}parent: 'mapper-generic', zone: '{$zonedata[0].zone}'{rdelim});
 					gE(ge('locations'), 'a')[0].onclick();
 				</script>
-{/literal}
+
 
 {else}
 				{#This_Object_cant_be_found#}
diff --git a/templates/wowhead/quest.tpl b/templates/wowhead/quest.tpl
index b807eae..6f0e56f 100644
--- a/templates/wowhead/quest.tpl
+++ b/templates/wowhead/quest.tpl
@@ -430,9 +430,9 @@
 			<div id="tabs-generic"></div>
 			<div id="listview-generic" class="listview"></div>
 			<script type="text/javascript">
-				var tabsRelated = new Tabs({ldelim}parent: ge('tabs-generic'){rdelim});
+				//var tabsRelated = new Tabs({ldelim}parent: ge('tabs-generic'){rdelim});
 				//new Listview({ldelim}template: 'comment', id: 'comments', name: LANG.tab_comments, tabs: tabsRelated, parent: 'listview-generic', data: lv_comments{rdelim});
-				tabsRelated.flush();
+				//tabsRelated.flush();
 			</script>
 
 			</div>