Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r137 -r141
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 137)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 141)
@@ -1520,7 +1520,7 @@
     	}
     }  	
 
-    function Query_List($whereClause,$orderByClause=NULL,$JoinCats=TRUE)
+    function Query_List($whereClause,$orderByClause=NULL,$JoinCats=TRUE,$fix_method='set_first')
     {
         global $objSession, $Errors;
 
@@ -1552,7 +1552,7 @@
         if($objSession->HasSystemPermission("DEBUG.LIST"))
             echo $sql."<br>\n";
         
-        return $this->Query_Item($sql);
+        return $this->Query_Item($sql, null, $fix_method);
     }    
     
     function GetPerPage()
@@ -1582,8 +1582,14 @@
       	{
       		switch($fix_method)
       		{
-      			case 'set_first': $this->Page = 1; break;
-      			case 'set_last': $this->Page = $NumPages; break;
+      			case 'set_first': 
+      				$this->Page = 1; 
+      				//echo "Move 2 First (class <b>".get_class($this)."</b>)<br>"; 
+      				break;
+      			case 'set_last': 
+      				$this->Page = $NumPages; 
+      				//echo "Move 2 Last (class <b>".get_class($this)."</b>)<br>"; 
+      				break;
     		}
     		$this->SaveNewPage();
     	}
Index: trunk/admin/advanced_view.php
===================================================================
diff -u -r129 -r141
--- trunk/admin/advanced_view.php	(.../advanced_view.php)	(revision 129)
+++ trunk/admin/advanced_view.php	(.../advanced_view.php)	(revision 141)
@@ -105,16 +105,6 @@
 $homeURL = "javascript:AdminCatNav('".$_SERVER["PHP_SELF"]."?env=".BuildEnv()."');";
 unset($m_var_list_update["cat"]);
 
-$envar = "env=" . BuildEnv();
-
-if($objCatList->CurrentCategoryID()>0)
-{
-  $c = $objCatList->CurrentCat();
-  $upURL = "javascript:AdminCatNav('".$c->Admin_Parent_Link()."');";
-}
-else
-  $upURL = $_SERVER["PHP_SELF"]."?".$envar;
-
 //admin only util
 
 $pathtolocal = $pathtoroot."kernel/";
@@ -123,16 +113,19 @@
 require_once ($pathtolocal."admin/include/navmenu.php");
 require_once($pathtoroot.$admin."/browse/toolbar.php");
 
+$mod_prefixes = Array();
 $m = GetModuleArray();
 foreach($m as $key=>$value)
 {
     $path = $pathtoroot.$value."admin/include/parser.php";
     if(file_exists($path))
     {
       //echo "<!-- $path -->";
+      $mod_prefixes[] = $key;
       @include_once($path);
     }
 }
+
 if(!$is_install)
 {
   if (!admin_login())
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -r105 -r141
--- trunk/kernel/include/modules.php	(.../modules.php)	(revision 105)
+++ trunk/kernel/include/modules.php	(.../modules.php)	(revision 141)
@@ -130,7 +130,7 @@
     }
 }
 
-function BuildEnv()
+function BuildEnv($mod_prefix)
 {  
     global $var_list,$m_var_list, $var_list_update, $mod_prefix, $objSession, $objConfig,
            $ExtraVars, $objThemes, $CurrentTheme, $SessionQueryString, $FrontEnd;
@@ -184,11 +184,14 @@
       foreach($mod_prefix as $key => $value)
 	  {        
        	$builder_name = $key . "_BuildEnv";
-        
         if(function_exists($builder_name))
-		  $env .= $builder_name();
+        { 
+        	$GLOBALS[$key.'_var_list_update']['test'] = 'test';
+        	$env .= $builder_name();
+        }
 	  }
     }
+    
     $extra = "";
     $keys = array_keys($ExtraVars);
     if(is_array($keys))
Index: trunk/kernel/admin/advanced_view.php
===================================================================
diff -u -r123 -r141
--- trunk/kernel/admin/advanced_view.php	(.../advanced_view.php)	(revision 123)
+++ trunk/kernel/admin/advanced_view.php	(.../advanced_view.php)	(revision 141)
@@ -24,7 +24,7 @@
 $section = 'in-portal:advanced_view';
 
 //Set Environment Variable
-$envar = "env=" . BuildEnv();
+$envar = "env=" . BuildEnv($mod_prefixes);
 
 ?>
 <!-- CATS -->