Index: trunk/kernel/include/advsearch.php
===================================================================
diff -u -N -r13 -r35
--- trunk/kernel/include/advsearch.php	(.../advsearch.php)	(revision 13)
+++ trunk/kernel/include/advsearch.php	(.../advsearch.php)	(revision 35)
@@ -45,7 +45,8 @@
     {
         global $objSession;
 
-        $this->ResultTable = $objSession->GetSessionKey()."_Search";
+        //$this->ResultTable = $objSession->GetSessionKey()."_Search";
+        $this->ResultTable = $objSession->GetSessionTable('Search', '');
         $this->classname= $DataClass;
     }
 
@@ -158,6 +159,7 @@
         $SelectSQL .= "GROUP BY $idField ";
         $this->adodbConnection->Execute("DROP TABLE ".$this->ResultTable);
         $full_sql = "CREATE TABLE ".$this->ResultTable." ".$indexSQL.$SelectSQL;         
+        
         $this->adodbConnection->Execute($full_sql);
         //echo "<PRE>$full_sql</PRE>";
     }
Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r13 -r35
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 13)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 35)
@@ -913,7 +913,7 @@
           $table = $prefix."ses_".$this->GetSessionKey()."_search_".$base_table;
         }
         else
-          $table = $prefix."ses_".$this->GetSessionKey()."_search";
+          $table = $this->GetSessionTable('Search',''); //$prefix."ses_".$this->GetSessionKey()."_search";
         return $table;
     }
 
Index: trunk/admin/email/sendmail.php
===================================================================
diff -u -N -r13 -r35
--- trunk/admin/email/sendmail.php	(.../sendmail.php)	(revision 13)
+++ trunk/admin/email/sendmail.php	(.../sendmail.php)	(revision 35)
@@ -132,7 +132,7 @@
 ?>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-<form ID="sendmail" name="sendmail" action="<?php echo $adminURL."/email/do_send.php?env=".BuildEnv(); ?>" enctype="multipart/form-data" method=POST>   
+<form ID="sendmail" name="sendmail" action="<?php echo $adminURL."/email/do_send.php?env=".BuildEnv(); ?>&destform=popup" enctype="multipart/form-data" method=POST>   
   <INPUT TYPE="HIDDEN" NAME="EmailState" VALUE="<?php echo $action; ?>">
   <?php int_subsection_title(admin_language("la_tab_General")); ?>
 
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r29 -r35
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 29)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 35)
@@ -746,16 +746,13 @@
          }
      break;
      case "m_adv_search":
-        if(!is_object($objSearchConfig))
-          $objSearchConfig = new clsSearchConfigList();
+        if( !is_object($objSearchConfig) ) $objSearchConfig = new clsSearchConfigList();
      	switch($_GET["type"])
      	{
      		case 1: /* category */
      			$objAdvSearch = new clsAdvancedSearchResults("Category","clsCategory");
 				foreach($objSearchConfig->Items as $field)
 				{
-					
-					echo "TEST";
 					$fld = $field->Get("FieldName");
 
  					$Verb = $_POST["verb"][$field->Get("FieldName")];
@@ -787,7 +784,7 @@
  						$objAdvSearch->AddAdvancedField($field->Get("TableName"),$field->Get("FieldName"),$Verb,$Value,$Conjuction);
  						
 				}
-				$objAdvSearch->PerformSearch(1,NULL,TRUE); 			
+				$objAdvSearch->PerformSearch(1,NULL,TRUE);
      		break;
      	}
      break;
Index: trunk/admin/email/do_send.php
===================================================================
diff -u -N -r13 -r35
--- trunk/admin/email/do_send.php	(.../do_send.php)	(revision 13)
+++ trunk/admin/email/do_send.php	(.../do_send.php)	(revision 35)
@@ -126,7 +126,7 @@
   $FromName = "System Administrator";
 }
 
-$TargetURL = $_SERVER["PHP_SELF"]."?".$envar;
+$TargetURL = $_SERVER["PHP_SELF"]."?".$envar.'&destform=popup';
 $CancelURL = $TargetURL."&EmailState=email_user_cancel";