diff --git a/lib/wow_tooltips b/lib/wow_tooltips
index fc8d79f..e6b8199 160000
--- a/lib/wow_tooltips
+++ b/lib/wow_tooltips
@@ -1 +1 @@
-Subproject commit fc8d79fcab20a2dbe18897798ac30113c1a30490
+Subproject commit e6b8199e2abf40725f0ad3b69a5d052dd46c3f07
diff --git a/mojotrollz/api/qq/TBC_ITEMEXTENDEDCOST.php b/mojotrollz/api/qq/TBC_ITEMEXTENDEDCOST.php
index a3f3ae9..f888b27 100644
--- a/mojotrollz/api/qq/TBC_ITEMEXTENDEDCOST.php
+++ b/mojotrollz/api/qq/TBC_ITEMEXTENDEDCOST.php
@@ -3,10 +3,10 @@ namespace SQL;
 class TBC_ITEMEXTENDEDCOST extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return
-'SELECT itemextendedcost.*,'.
+'SELECT itemextendedcost.1 as entry, itemextendedcost.*,'.
 ' lower(mangos_one_dbc.itemdisplayinfo.6) as icon'.
 ' FROM itemextendedcost'.
-' LEFT JOIN mangos_one_world.item_template AS item ON itemextendedcost.5 = item.entry'.
+' LEFT JOIN mangos_one_world.item_template AS item ON itemextendedcost.4 = item.entry'.
 ' LEFT JOIN itemdisplayinfo ON item.displayid = itemdisplayinfo.1'.
 ' WHERE itemextendedcost.1 = ?;';
     }
diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php
index 9bc6b5d..4506652 100644
--- a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php
+++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php
@@ -67,6 +67,9 @@ class saimod_mojotrollz_npc_vendor_template extends \SYSTEM\SAI\SaiModule {
         $vars['search'] = htmlentities($search);
         $vars['count'] = $count_filtered.'/'.$count;
         $vars['entry'] = $entry;
+        $vars['wow_tooltip_templates'] = '';
+        $vars['wow_tooltip_templates'] .= \SYSTEM\PAGE\replace::replaceFile((new \PLIB('wow_tooltips/lib/tpl/wow-item-template.tpl'))->SERVERPATH());
+        $vars['wow_tooltip_templates'] .= \SYSTEM\PAGE\replace::replaceFile((new \PLIB('wow_tooltips/lib/tpl/wow-itemextendedcost-template.tpl'))->SERVERPATH());
         $vars = array_merge($vars,  \SYSTEM\PAGE\text::tag('basic'));
         return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor.tpl'))->SERVERPATH(), $vars);
     }
diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor.tpl b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor.tpl
index 2db02ae..08e76e3 100644
--- a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor.tpl
@@ -51,110 +51,4 @@
 <br>
 <button id="btn_back" onClick="system.back();" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span> ${basic_back}</button>
 
-<script id="wow-item-template" type="text/x-handlebars-template">
-    <aside class="wow-item hidden" data-quality="{{ quality }}">
-        <header class="wow-item__header">
-            <p class="header__title">{{ name }}</p>
-            {{#if ItemLevel}}
-            <p class="info__item-level">Item Level {{ ItemLevel }}</p>
-            {{/if}}
-            {{#if binds}}<p class="header__binds">{{ binds }}</p>{{/if}}
-      {{#if unique}}
-        <p class="header__unique">Unique</p>
-      {{/if}}
-    </header>
-    <section class="wow-item__type">
-      <p class="type__slot">{{slot}}</p>
-      <p class="type__item">{{type}}</p>
-    </section>
-    <section class="wow-item__stats">
-      {{#if damage}}
-      <p class="stats__damage-armor"><span class="value">{{ damage.min }} - {{damage.max}}</span> Damage</p>
-      <p class="stats__speed">Speed <span class="value">{{ speed damage.speed }}</span></p>
-      <p class="stats__dps">(<span class="value">{{ dps damage }}</span> damage per second)</p>
-      {{/if}}
-      
-      {{#if armor}}
-      <p class="stats__armor">{{ armor }} Armor</p>
-      {{/if}}
-      
-      <div class="stats__list">
-        {{#each stats}}
-        <p class="stats__{{ type }} stats__list-item">+{{ value }} {{ stat }}</p>
-        {{/each}}
-      </div>
-      
-    </section>
-    
-    {{#if enchantments}}
-    <section class="wow-item__enchantments">
-      
-      {{#each enchantments.enchants}}
-      <p class="enchantments__enchant">{{ description }}</p>
-      {{/each}}
-      
-      <div class="enchantments__sockets">
-        
-        {{#each enchantments.sockets }}
-        <p class="enchantments__socket socket--{{ color }}">{{ color }} socket</p>
-        {{/each}}
-
-        {{#if enchantments.socketBonus}}
-        <p class="enchantments__socket-bonus">Socket Bonus: {{ enchantments.socketBonus }}</p>
-        {{/if}}
-        
-      </div>
-      
-    </section>
-    {{/if}}
-    
-    <section class="wow-item__info">
-      
-      {{#if MaxDurability}}
-      <p class="info__durability">Durability: {{ MaxDurability }} / {{ MaxDurability }}</p>
-      {{/if}}
-      
-      {{#each chanceOnHit}}
-      <p class="info__chance-on-hit">Chance on hit: {{ description }}</p>
-      {{/each}}
-      
-      {{#if classes}}
-      <p class="info__class-requirement">Classes: <span class="value">{{ classes classes }}</span></p>
-      {{/if}}
-      
-      {{#if RequiredLevel}}
-      <p class="info__level-requirement">Requires Level {{ RequiredLevel }}</p>
-      {{/if}}
-    </section>
-    
-    {{#if bonuses}}
-    <section class="wow-item__bonuses">
-      {{#each bonuses}}
-      <p class="bonuses__bonus">{{ description }}</p>
-      {{/each}}
-    </section>
-    {{/if}}
-    
-    <section class="wow-item__info">
-
-      {{#if tradelevel }}
-      <p class="info__trade-level">Requires {{ tradelevel.trade }} ({{ tradelevel.level }})</p>
-      {{/if}}
-
-      {{#if description }}
-      <p class="info__flavour-text">"{{ description }}"</p>
-      {{/if}}
-    </section>
-    <section class="wow-item__price">
-      {{#if price_gold }}
-      <p class="price__gold">Sell Price: {{ price_gold }}</p>
-      {{/if}}
-      {{#if price_silver }}
-      <p class="price__silver">{{ price_silver }}</p>
-      {{/if}}
-      {{#if price_copper }}
-      <p class="price__copper">{{ price_copper }}</p>
-      {{/if}}
-    </section>
-  </aside>
-</script>
\ No newline at end of file
+${wow_tooltip_templates}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_entry.tpl
index 4809561..668d269 100644
--- a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_entry.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/tpl/npc_vendor_template_vendor_entry.tpl
@@ -3,7 +3,7 @@
     <td>${item} <i class="wow-icon" data-item-id="${item}"></i></td>
     <td>${maxcount}</td>
     <td>${incrtime}</td>
-    <td>${ExtendedCost}</td>
+    <td>${ExtendedCost} <i class="wow-icon" data-itemextendedcost-id="${ExtendedCost}"></i></td>
     <td>${condition_id}</td>
     <td>
         <button type="button" class="btn-sm btn btn-success btn_edit" _entry="${entry}" _item="${item}" _maxcount="${maxcount}" _incrtime="${incrtime}" _extendedcost="${extendedcost}" _condition_id="${condition_id}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></button>