Index: trunk/admin/install.php
===================================================================
diff -u -N -r985 -r1080
--- trunk/admin/install.php	(.../install.php)	(revision 985)
+++ trunk/admin/install.php	(.../install.php)	(revision 1080)
@@ -1731,7 +1731,12 @@
     $help .="If this option is selected you will be prompted for new database configuration information.</p>";
     $help .="<p>The <i>Update License Information</i> option is used to update your In-Portal license data.  Select this option if you have ";
     $help .="modified your licensing status with Intechnic, or you have received new license data via email</p>";
+    $help .="<p>The <i>Fix Paths</i> option should be used when the location of the In-portal files has changed. For example, if you moved them from one folder to another. It will update all settings and ensure the program is operational at the new location.</p>";
 break;
+case "fix_paths":
+	$title = "Fix Paths";
+	$help = "<p>The <i>Fix Paths</i> option should be used when the location of the In-portal files has changed. For example, if you moved them from one folder to another. It will update all settings and ensure the program is operational at the new location.<p>";
+break;
 case "RootPass":
     $title = "Set Admin Root Password";
     $help = "<p>The Root Password is initially required to access the admin sections of In-Portal. ";
Index: trunk/themes/default/sort_cats.tpl
===================================================================
diff -u -N -r1025 -r1080
--- trunk/themes/default/sort_cats.tpl	(.../sort_cats.tpl)	(revision 1025)
+++ trunk/themes/default/sort_cats.tpl	(.../sort_cats.tpl)	(revision 1080)
@@ -24,25 +24,25 @@
 
 				<inp:m_language _Phrase="lu_show" />
 
-				<SELECT name="cat_perpage" class="small">
+				<SELECT name="Perpage_Category" class="small">
 
-				  <inp:m_form_option _Field="cat_perpage" _Form="l_sort_cats"  _value="10" _PlainText="10" />				 
+				  <inp:m_form_option _Field="Perpage_Category" _Form="l_sort_cats"  _value="10" _PlainText="10" />				 
 
-				  <inp:m_form_option _Field="cat_perpage" _Form="l_sort_cats"  _value="20" _PlainText="20" />				 
+				  <inp:m_form_option _Field="Perpage_Category" _Form="l_sort_cats"  _value="20" _PlainText="20" />				 
 
-				  <inp:m_form_option _Field="cat_perpage" _Form="l_sort_cats"  _value="50" _PlainText="50" />				 				  
+				  <inp:m_form_option _Field="Perpage_Category" _Form="l_sort_cats"  _value="50" _PlainText="50" />				 				  
 
 				</SELECT>
 
 				<inp:m_language _Phrase="lu_sort_by" />
 
-				<SELECT name="cat_sort_field" class="small">						  
+				<SELECT name="Category_Sortfield" class="small">						  
 
-				  <inp:m_form_option _Field="cat_sort_field" _Form="l_sort_cats"  _value="Name" _LangText="lu_prompt_catname" />
+				  <inp:m_form_option _Field="Category_Sortfield" _Form="l_sort_cats"  _value="Name" _LangText="lu_prompt_catname" />
 
-				  <inp:m_form_option _Field="cat_sort_field" _Form="l_sort_cats"  _value="CreatedOn" _LangText="lu_date" />
+				  <inp:m_form_option _Field="Category_Sortfield" _Form="l_sort_cats"  _value="CreatedOn" _LangText="lu_date" />
 
-				  <inp:m_form_option _Field="cat_sort_field" _Form="l_sort_cats"  _value="Description" _LangText="lu_field_description" />
+				  <inp:m_form_option _Field="Category_Sortfield" _Form="l_sort_cats"  _value="Description" _LangText="lu_field_description" />
 
 				  <!--<inp:m_form_option _Field="cat_sort_field" _Form="l_sort_cats"  _value="CreatedById" _LangText="la_Text_Users" />
 
@@ -58,11 +58,11 @@
 
 				</SELECT>
 
-				<SELECT name="cat_sort_order" class="small">
+				<SELECT name="Category_Sortorder" class="small">
 
-					<inp:m_form_option _Field="cat_sort_order" _Form="l_sort_cats"  _value="ASC" _LangText="lu_Ascending" />				 
+					<inp:m_form_option _Field="Category_Sortorder" _Form="l_sort_cats"  _value="ASC" _LangText="lu_Ascending" />				 
 
-					<inp:m_form_option _Field="cat_sort_order" _Form="l_sort_cats"  _value="DESC" _LangText="lu_Descending" />				 					
+					<inp:m_form_option _Field="Category_Sortorder" _Form="l_sort_cats"  _value="DESC" _LangText="lu_Descending" />				 					
 
 				</SELECT>
 
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r1072 -r1080
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1072)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1080)
@@ -1930,7 +1930,7 @@
          if(is_object($objSession))
          {
            $FieldVarData = $objSession->GetPersistantVariable($FieldVar);
-           //echo "FieldVar: $FieldVarData<br>";
+           //echo "FieldVar: $FieldVar<br>";
            if(strlen($FieldVarData)>0)  
            {  		
 	           	$Orders[] = trim($TableName.$objSession->GetPersistantVariable($FieldVar) . " ". 
@@ -2470,7 +2470,9 @@
  	   
        $OrderBy = $this->QueryOrderByClause(TRUE,TRUE,TRUE);
        $sql .= " ".$OrderBy; 
-	         
+	    
+       //echo "SQL: $sql<br>";     
+       
        return $sql;
     }    	
     
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r1063 -r1080
--- trunk/kernel/parser.php	(.../parser.php)	(revision 1063)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 1080)
@@ -504,7 +504,7 @@
 */
 function m_form_option($attribs = array())
 {
-    global $FormValues;
+    global $FormValues, $objSession;
 
     $html_attribs = ExtraAttributes($attribs); 
     $field = $attribs["_field"];
@@ -516,11 +516,13 @@
     }
     else
     { 
-    	$value = $FormValues[$attribs['_form']][$field];
+    	$value = isset($FormValues[$attribs['_form']][$field]) ? $FormValues[$attribs['_form']][$field] : strtoupper($objSession->GetPersistantVariable($field));
     }   
     
     $selected = ($val == $value)? "SELECTED" : "";
     
+    //echo "Sel $field = $value: $selected<br>";
+    
     if( getArrayValue($attribs,'_langtext') )
     {
         $txt = language($attribs["_langtext"]);
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r1072 -r1080
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 1072)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 1080)
@@ -623,9 +623,9 @@
      break;
      
      case "m_sort_cats":         
-         $objSession->SetVariable("Category_Sortfield",$_POST["cat_sort_field"]);
-         $objSession->SetVariable("Category_Sortorder",$_POST["cat_sort_order"]);
-         $objSession->SetVariable("Perpage_Category",$_POST["cat_perpage"]);
+         $objSession->SetVariable("Category_Sortfield",$_POST["Category_Sortfield"]);
+         $objSession->SetVariable("Category_Sortorder",$_POST["Category_Sortorder"]);
+         $objSession->SetVariable("Perpage_Category",$_POST["Perpage_Category"]);
          DeleteModuleTagCache('kernel');
      break;
      case "m_add_cat_confirm":
@@ -842,16 +842,16 @@
            else {
            	$key_arr = explode(' ', $keywords);
            	
-           	foreach($key_arr as $value) {
+           	/*foreach($key_arr as $value) {
            		if (strlen(str_replace("+", "", $value)) < $length || strlen(str_replace("-", "", $value)) < $length) {
-           			$keywords = str_replace(' '.$value, '', $keywords);
-           			$keywords = str_replace($value.' ', '', $keywords);           			
+           			$keywords = str_replace($value, '', $keywords);
+           			//$keywords = str_replace($value, '', $keywords);           			
            		}
            	}
            	
            	//$keywords = str_replace('  ', ' ', $keywords);
            	//$keywords = str_replace('\"', '', $keywords);
-           	
+           	*/
            	$tmp_keywords = str_replace("+", "", $keywords);
            	$tmp_keywords = str_replace("-", "", $tmp_keywords);
            	
Index: trunk/kernel/include/searchitems.php
===================================================================
diff -u -N -r1031 -r1080
--- trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 1031)
+++ trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 1080)
@@ -578,7 +578,7 @@
 
 function GetKeywords($phrase)
 {
-    global $KeywordIgnore;
+    global $KeywordIgnore, $objConfig;
     
     //echo "Passed Phrase: $phrase<br>";
     if(count($KeywordIgnore)==0)
@@ -587,6 +587,7 @@
     $keywords["required"]= array();
     $keywords["notallowed"] = array();
     $keywords["ignored"] = array();  
+    $min_length = $objConfig->Get('Search_MinKeyword_Length');
     if(!strlen($phrase))
         return trim($keywords);
     $w_array = array();
@@ -688,16 +689,24 @@
       switch(substr($keyword,0,1))
       {
         case "|":
-           $keywords["normal"][]= substr($keyword,1);
+           if (strlen(substr($keyword,1)) >= $min_length) {
+           		$keywords["normal"][]= substr($keyword,1);
+           }
            break;
         case "+":
-           $keywords["required"][] = substr($keyword,1);
+        	if (strlen(substr($keyword,1)) >= $min_length) {
+           		$keywords["required"][] = substr($keyword,1);
+        	}
            break;
         case "-":
-           $keywords["notallowed"][] = substr($keyword,1);
+        	if (strlen(substr($keyword,1)) >= $min_length) {
+           		$keywords["notallowed"][] = substr($keyword,1);
+        	}
            break;
         case "=":
-           $keywords["ignored"][] = substr($keyword,1);
+        	if (strlen(substr($keyword,1)) >= $min_length) {
+           		$keywords["ignored"][] = substr($keyword,1);
+        	}
            break;
       }
   }