diff --git a/includes/types/spell.class.php b/includes/types/spell.class.php
index af64ba41..226b6278 100644
--- a/includes/types/spell.class.php
+++ b/includes/types/spell.class.php
@@ -1471,12 +1471,12 @@ class SpellList extends BaseType
             }
             list($formOutVal, $formOutStr, $ratingId) = $this->resolveFormulaString($formOutStr, $formPrecision ?: ($topLevel ? 0 : 10), $scaling);
 
-            if ($ratingId && is_numeric($formOutVal) && $this->interactive)
+            if ($ratingId && Util::checkNumeric($formOutVal) && $this->interactive)
                 $resolved = sprintf($formOutStr, $ratingId, abs($formOutVal), sprintf(Util::$setRatingLevelString, $this->charLevel, $ratingId, abs($formOutVal), Util::setRatingLevel($this->charLevel, $ratingId, abs($formOutVal))));
-            else if ($ratingId && is_numeric($formOutVal))
+            else if ($ratingId && Util::checkNumeric($formOutVal))
                 $resolved = sprintf($formOutStr, $ratingId, abs($formOutVal), Util::setRatingLevel($this->charLevel, $ratingId, abs($formOutVal)));
             else
-                $resolved = sprintf($formOutStr, is_numeric($formOutVal) ? abs($formOutVal) : $formOutVal);
+                $resolved = sprintf($formOutStr, Util::checkNumeric($formOutVal) ? abs($formOutVal) : $formOutVal);
 
             $data = substr_replace($data, $resolved, $formStartPos, ($formCurPos - $formStartPos));
         }
diff --git a/setup/tools/filegen/enchants.func.php b/setup/tools/filegen/enchants.func.php
index aa8a3e91..df8c88d5 100644
--- a/setup/tools/filegen/enchants.func.php
+++ b/setup/tools/filegen/enchants.func.php
@@ -65,7 +65,7 @@ if (!CLI)
                 effect1MiscValue,
                 equippedItemClass, equippedItemInventoryTypeMask, equippedItemSubClassMask,
                 skillLine1,
-                IFNULL(i.iconString, "inv_misc_questionmark") AS iconString,
+                IFNULL(i.name, "inv_misc_questionmark") AS iconString,
                 name_loc0, name_loc2, name_loc3, name_loc6, name_loc8
             FROM
                 ?_spell s
diff --git a/setup/tools/filegen/gems.func.php b/setup/tools/filegen/gems.func.php
index be8e87ad..fd79050c 100644
--- a/setup/tools/filegen/gems.func.php
+++ b/setup/tools/filegen/gems.func.php
@@ -33,11 +33,11 @@ if (!CLI)
                       i.name_loc0, i.name_loc2, i.name_loc3, i.name_loc6, i.name_loc8,
                       IF (i.id < 36000 OR i.itemLevel < 70, 1 , 2) AS expansion,
                       i.quality,
-                      ic.iconString AS icon,
+                      ic.name AS icon,
                       i.gemEnchantmentId AS enchId,
                       i.gemColorMask AS colors
             FROM      ?_items i
-            JOIN      ?_icons ic ON ic.id = -i.displayId
+            JOIN      ?_icons ic ON ic.id = i.iconId
             WHERE     i.gemEnchantmentId <> 0
             ORDER BY  i.id DESC');
         $success = true;
diff --git a/setup/tools/filegen/glyphs.func.php b/setup/tools/filegen/glyphs.func.php
index b8688200..1ec2a1a3 100644
--- a/setup/tools/filegen/glyphs.func.php
+++ b/setup/tools/filegen/glyphs.func.php
@@ -32,7 +32,7 @@ if (!CLI)
                    i.subclass AS classs,
                    i.requiredLevel AS level,
                    s1.Id AS glyphSpell,
-                   ic.iconString AS icon,
+                   ic.name AS icon,
                    s1.skillLine1 AS skillId,
                    s2.Id AS glyphEffect,
                    s2.Id AS ARRAY_KEY
diff --git a/setup/tools/filegen/talentIcons.func.php b/setup/tools/filegen/talentIcons.func.php
index 949a2d9c..48f4b89e 100644
--- a/setup/tools/filegen/talentIcons.func.php
+++ b/setup/tools/filegen/talentIcons.func.php
@@ -15,7 +15,7 @@ if (!CLI)
     function talentIcons()
     {
         $success   = true;
-        $query     = 'SELECT ic.iconString FROM ?_icons ic JOIN dbc_spell s ON s.iconId = ic.Id JOIN dbc_talent t ON t.rank1 = s.Id JOIN dbc_talenttab tt ON tt.Id = t.tabId WHERE tt.?# = ?d AND tt.tabNumber = ?d ORDER BY t.row, t.column, t.petCategory1 ASC';
+        $query     = 'SELECT ic.name AS iconString FROM ?_icons ic JOIN ?_spell s ON s.iconId = ic.Id JOIN dbc_talent t ON t.rank1 = s.id JOIN dbc_talenttab tt ON tt.Id = t.tabId WHERE tt.?# = ?d AND tt.tabNumber = ?d ORDER BY t.row, t.column, t.petCategory1 ASC';
         $dims      = 36; //v-pets
         $filenames = ['icons', 'warrior', 'paladin', 'hunter', 'rogue', 'priest', 'deathknight', 'shaman', 'mage', 'warlock', null, 'druid'];
 
diff --git a/static/js/basic.js b/static/js/basic.js
index 1a6360d5..f8da5d6b 100644
--- a/static/js/basic.js
+++ b/static/js/basic.js
@@ -1627,7 +1627,7 @@ $WH.g_enhanceTooltip = function(tooltip, isStatic, useGets, showSlider, buff, kn
 
                 $(chooseSpells)
                     .append('<input type="checkbox" id="known-' + i + '" />')
-                    .append('<label for="known-' + i + '"><a rel="spell=' + i + '&know=' + i + '">' + g_spells[i]['name_' + Locale.getName()] + (g_spells[i]['rank_' + Locale.getName()] ? ' (' + g_spells[i]['rank_' + Locale.getName()] + ')' : '') + '</a></label>')
+                    .append('<label for="known-' + i + '"><a rel="spell=' + i + '&know=' + i + '&domain=' + Locale.current.domain + '">' + g_spells[i]['name_' + Locale.getName()] + (g_spells[i]['rank_' + Locale.getName()] ? ' (' + g_spells[i]['rank_' + Locale.getName()] + ')' : '') + '</a></label>')
                     .append('<br />');
 
                 $('#known-' + i).change($WH.g_tooltipSpellsChange.bind(this));
diff --git a/template/bricks/contribute.tpl.php b/template/bricks/contribute.tpl.php
index e986fb50..c4291f8b 100644
--- a/template/bricks/contribute.tpl.php
+++ b/template/bricks/contribute.tpl.php
@@ -29,4 +29,4 @@ if (!empty($this->contribute)):
 ?>
     tabsContribute.flush();
 </script>
-<? endif; ?>
+<?php endif; ?>