diff --git a/faction.php b/faction.php
index 1da6355..4870e12 100644
--- a/faction.php
+++ b/faction.php
@@ -57,7 +57,7 @@ if (!$faction = load_cache(18, intval($id))) {
         // Итемы с requiredreputationfaction
         $item_rows = $DB->select('
 			SELECT ?#, entry
-			FROM ?_item_template i, '.$UDWBaseconf['aowow']['db'].'?_aowow_icons a
+			FROM ?_item_template i, '.$UDWBaseconf['aowow']['db'].'.?_aowow_icons a
 			WHERE
 				i.RequiredReputationFaction=?d
 				AND a.id=i.displayid
diff --git a/factions.php b/factions.php
index 63241d2..fd35899 100644
--- a/factions.php
+++ b/factions.php
@@ -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 '.$UDWBaseconf['aowow']['db'].'?_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/allitems.php b/includes/allitems.php
index 2b99a25..cccee7f 100644
--- a/includes/allitems.php
+++ b/includes/allitems.php
@@ -496,7 +496,7 @@ function iteminfo2(&$Row, $level=0) {
     global $object_cols;
 
     if (!isset($Row['entry']))
-        return;
+        return array();
 
     $item = array();
     // Номер вещи
diff --git a/itemset.php b/itemset.php
index fcca934..6f296bc 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 '.$UDWBaseconf['aowow']['db'].'.?_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/npc.php b/npc.php
index 243a235..f65b0e9 100644
--- a/npc.php
+++ b/npc.php
@@ -61,7 +61,7 @@ if (!$npc = load_cache(1, intval($id))) {
         $npc['mindmg'] = ($row['mindmg'] /* + $row['attackpower'] */) * $row['dmg_multiplier'];
         $npc['maxdmg'] = ($row['maxdmg'] /* + $row['attackpower'] */) * $row['dmg_multiplier'];
 
-        $toDiv = array('minhealth', 'maxmana', 'minmana', 'maxhealth', 'armor', 'mindmg', 'maxdmg');
+        $toDiv = array('minlevelhealth', 'maxlevelmana', 'minlevelmana', 'maxlevelhealth', 'armor', 'minmeeledmg', 'maxmeeledmg', 'minrangeddmg', 'maxrangeddmg');
         // Разделяем на тысячи (ххххххххх => ххх,ххх,ххх)
         foreach ($toDiv as $element) {
             $current = array();
diff --git a/object.php b/object.php
index a1ce781..b6eee2f 100644
--- a/object.php
+++ b/object.php
@@ -48,7 +48,7 @@ if (!$object = load_cache(3, intval($id))) {
 
     // Заканчивают квесты...
     $rows_qe = $DB->select('
-		SELECT i.?#
+		SELECT ?#
 		FROM ?_gameobject_questrelation i, ?_quest_template q
 		WHERE
 			i.id = ?d
diff --git a/templates/wowhead/npc.tpl b/templates/wowhead/npc.tpl
index 9139436..eccacc4 100644
--- a/templates/wowhead/npc.tpl
+++ b/templates/wowhead/npc.tpl
@@ -19,9 +19,9 @@
 						<li><div>{#Classification#}: {$npc.rank}</div></li>
 						<li><div>{#React#}: <span class="q{if $npc.A==-1}7{elseif $npc.A==1}2{else}{/if}">A</span> <span class="q{if $npc.H==-1}7{elseif $npc.H==1}2{else}{/if}">H</span></div></li>
 						<li><div>{#Faction#}: <a href="?faction={$npc.faction_num}">{$npc.faction}</a></div></li>
-						<li><div>{#Health#}: {if $npc.minhealth<>$npc.maxhealth}{$npc.minhealth} - {/if}{$npc.maxhealth}</div></li>
-{if ($npc.minmana or $npc.maxmana)}
-						<li><div>{#Mana#}: {if $npc.minmana<>$npc.maxmana}{$npc.minmana} - {/if}{$npc.maxmana}</div></li>
+						<li><div>{#Health#}: {if $npc.minlevelhealth<>$npc.maxlevelhealth}{$npc.minlevelhealth} - {/if}{$npc.maxlevelhealth}</div></li>
+{if ($npc.minlevelmana or $npc.maxlevelmana)}
+						<li><div>{#Mana#}: {if $npc.minlevelmana<>$npc.maxlevelmana}{$npc.minlevelmana} - {/if}{$npc.maxlevelmana}</div></li>
 {/if}
 {if ($npc.moneysilver>0) or ($npc.moneygold>0) or ($npc.moneycopper>0)}
 						<li><div>{#Wealth#}:{if ($npc.moneygold>0)}
@@ -32,8 +32,11 @@
  <span class="moneycopper">{$npc.moneycopper}</span>{/if}
 </div></li>
 {/if}
-{if $npc.mindmg > 0 and $npc.maxdmg > 0}
-						<li><div>{#Damage#}: {$npc.mindmg} - {$npc.maxdmg}</div></li>
+{if $npc.minmeeledmg > 0 and $npc.maxmeeledmg > 0}
+						<li><div>{#Damage#}: {$npc.minmeeledmg} - {$npc.maxmeeledmg}</div></li>
+{/if} 
+{if $npc.minrangeddmg > 0 and $npc.maxrangeddmg > 0}
+						<li><div>{#Damage#}: {$npc.minrangeddmg} - {$npc.maxrangeddmg}</div></li>
 {/if} 
 {if $npc.armor > 0}
 						<li><div>{#Armor#}: {$npc.armor}</div></li>
diff --git a/templates/wowhead/quest.tpl b/templates/wowhead/quest.tpl
index 98296ee..634e67d 100644
--- a/templates/wowhead/quest.tpl
+++ b/templates/wowhead/quest.tpl
@@ -329,7 +329,7 @@
 						<table class="icontab">
 						<tr>
 {section name=j loop=$quest.itemchoices}
-								<th id="icontab-icon{$smarty.section.j.index+1}"></th>
+								<th id="icontab-icon-choice{$smarty.section.j.index+1}"></th>
 								<td>
 									<span class="q{$quest.itemchoices[j].quality}">
 										<a href="?item={$quest.itemchoices[j].entry}">
@@ -342,7 +342,7 @@
 						</table>
 						<script type="text/javascript">
 						{section name=j loop=$quest.itemchoices}
-							ge('icontab-icon{$smarty.section.j.index+1}').appendChild(g_items.createIcon({$quest.itemchoices[j].entry}, 1, {$quest.itemchoices[j].count}));
+							ge('icontab-icon-choice{$smarty.section.j.index+1}').appendChild(g_items.createIcon({$quest.itemchoices[j].entry}, 1, {$quest.itemchoices[j].count}));
 						{/section}
 						</script>
 {/if}
@@ -353,7 +353,7 @@
 						<table class="icontab">
 						<tr>{strip}
 {section name=j loop=$quest.itemrewards}
-								<th id="icontab-icon{$smarty.section.j.index+1}"></th>
+								<th id="icontab-icon-reward{$smarty.section.j.index+1}"></th>
 								<td>
 									<span class="q{$quest.itemrewards[j].quality}">
 										<a href="?item={$quest.itemrewards[j].entry}">
@@ -366,7 +366,7 @@
 						</table>
 						<script type="text/javascript">
 						{section name=j loop=$quest.itemrewards}
-							ge('icontab-icon{$smarty.section.j.index+1}').appendChild(g_items.createIcon({$quest.itemrewards[j].entry}, 1, {$quest.itemrewards[j].count}));
+							ge('icontab-icon-reward{$smarty.section.j.index+1}').appendChild(g_items.createIcon({$quest.itemrewards[j].entry}, 1, {$quest.itemrewards[j].count}));
 						{/section}
 						</script>
 {/if}