diff --git a/pages/items.php b/pages/items.php
index b565f0d2..b953557e 100644
--- a/pages/items.php
+++ b/pages/items.php
@@ -175,8 +175,8 @@ class ItemsPage extends GenericPage
             $upgItems = new ItemList(array(['id', array_keys($this->filter['upg'])]), ['extraOpts' => $this->filterObj->extraOpts]);
             if (!$upgItems->error)
             {
-                $this->extendGlobalData($upgItems->getJSGlobals());
                 $upgItemData = $upgItems->getListviewData($infoMask);
+                $this->extendGlobalData($upgItems->getJSGlobals(GLOBALINFO_SELF | GLOBALINFO_RELATED));
             }
         }
 
@@ -316,11 +316,11 @@ class ItemsPage extends GenericPage
             if ($items->error)
                 continue;
 
-            $this->extendGlobalData($items->getJSGlobals());
             $tabData = array_merge(
                 ['data' => $items->getListviewData($infoMask)],
                 $this->sharedLV
             );
+            $this->extendGlobalData($items->getJSGlobals(GLOBALINFO_SELF | GLOBALINFO_RELATED));
 
             $upg = [];
             if ($upgItemData)
diff --git a/pages/npc.php b/pages/npc.php
index 0599cd83..8d24459a 100644
--- a/pages/npc.php
+++ b/pages/npc.php
@@ -734,7 +734,7 @@ class NpcPage extends GenericPage
                     'name'      => $sf[2],
                     'id'        => $sf[3],
                     'extraCols' => $extraCols,
-                    'sort'      => ['-percent', 'name'],
+                    'sort'      => ['-percent', 'name']
                 );
 
                 if (!empty($sf['note']))