Index: trunk/themes/default/advsearch/advsearch_type.tpl
===================================================================
diff -u -N -r1004 -r1012
--- trunk/themes/default/advsearch/advsearch_type.tpl	(.../advsearch_type.tpl)	(revision 1004)
+++ trunk/themes/default/advsearch/advsearch_type.tpl	(.../advsearch_type.tpl)	(revision 1012)
@@ -21,7 +21,7 @@
 		<td class="field-name">&nbsp;</td>
 		<td class="field-content"><img src="img/s.gif" width="1" height="15" alt="" /><br />																			
 			<INPUT type="submit" name="buttons[]" value="<inp:m_language _Phrase="lu_continue" />" class="button">
-      <INPUT type="reset" name="buttons[]" value="<inp:m_language _Phrase="lu_cancel" />" class="button">
+      <INPUT type="button" name="buttons[]" value="<inp:m_language _Phrase="lu_cancel" />" class="button" onClick="history.go(-1)">
 		</td>
 	</tr>
 	<tr>
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r988 -r1012
--- trunk/kernel/parser.php	(.../parser.php)	(revision 988)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 1012)
@@ -2035,7 +2035,7 @@
 
   	 	  $table = $Item->Get("SourceTable");
   	 	  //$sql = "SELECT * FROM ".$objSearchConfig->SourceTable." WHERE TableName='$table' AND AdvancedSearch=1 ORDER BY DisplayOrder";
-  	 	  $sql = "SELECT sc.* FROM ".$objSearchConfig->SourceTable." AS sc LEFT JOIN ".GetTablePrefix()."CustomField AS cf ON sc.CustomFieldId = cf.CustomFieldId  WHERE TableName='$table' OR (TableName='CustomField' AND cf.Type = $ItemType) AND AdvancedSearch=1 ORDER BY sc.DisplayOrder";
+  	 	  $sql = "SELECT sc.* FROM ".$objSearchConfig->SourceTable." AS sc LEFT JOIN ".GetTablePrefix()."CustomField AS cf ON sc.CustomFieldId = cf.CustomFieldId  WHERE TableName='$table' OR (TableName='".GetTablePrefix()."CustomField' AND cf.Type = $ItemType) AND AdvancedSearch=1 ORDER BY sc.DisplayOrder";
   	 	  $objSearchConfig->Query_Item($sql);
   	 	  $row=0;
   	 	  if(is_array($objSearchConfig->Items))
Index: trunk/themes/default/advsearch/advsearch_item.tpl
===================================================================
diff -u -N -r13 -r1012
--- trunk/themes/default/advsearch/advsearch_item.tpl	(.../advsearch_item.tpl)	(revision 13)
+++ trunk/themes/default/advsearch/advsearch_item.tpl	(.../advsearch_item.tpl)	(revision 1012)
@@ -18,7 +18,7 @@
 	<tr>
 		<td>																					
 			<INPUT type="submit" name="buttons[]" value="<inp:m_language _Phrase="lu_search" />" class="button">
-      <INPUT type="submit" name="buttons[]" value="<inp:m_language _Phrase="lu_cancel" />" class="button"><br /><br />
+      <INPUT type="button" name="buttons[]" value="<inp:m_language _Phrase="lu_cancel" />" onclick="history.go(-1)" class="button"><br /><br />
 		</td>
 	</tr>
 	<!-- end buttons -->