diff --git a/setup/tools/filegen/templates/power.js.in b/setup/tools/filegen/templates/power.js.in
index ad74112e..fa503107 100644
--- a/setup/tools/filegen/templates/power.js.in
+++ b/setup/tools/filegen/templates/power.js.in
@@ -206,7 +206,7 @@ if (typeof $WowheadPower == "undefined") {
                 return;
             }
 
-            if (t.rel && t.rel.indexOf("np") != -1) {
+            if (t.rel && t.rel.indexOf("np") != -1 && t.rel.indexOf("np") != t.rel.indexOf("npc=")) {
                 return;
             }
 
diff --git a/static/js/global.js b/static/js/global.js
index d6bb85be..7d435219 100644
--- a/static/js/global.js
+++ b/static/js/global.js
@@ -630,9 +630,12 @@ var PageTemplate = new function()
                 locale.description,
                 g_host + '/?locale=' + locale.id,                           // sarjuuk: edited for unsupported subdomains # linkBefore + locale.domain + linkAfter
                 null,                                                       // more custom
-                {rel: location.href + " domain=" + locale.domain}           // also custom
+                null                                                        // also custom
             ];
 
+            if (typeof g_pageInfo != 'undefined' && g_pageInfo.type && g_types[g_pageInfo.type])
+                menuItem[4] = {rel: g_types[g_pageInfo.type] + '=' + g_pageInfo.typeId + " domain=" + locale.domain};
+
             if(locale.id == localeId)
             {
                 menuItem.checked = true;