diff --git a/pages/ajax.searchform.php b/pages/ajax.searchform.php
index 6094a0a55..faa25a183 100644
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -63,6 +63,14 @@ try
 		$sHiddenCriteria = '';
 	}
 	$oFilter = CriterionParser::Parse($aParams['base_oql'], $aParams['criterion'], $sHiddenCriteria);
+
+	if (isset($aListParams['debug']))
+	{
+		$sOQL = $oFilter->ToOQL();
+		$oPage->add("<div class=\"header_message message_info\">$sOQL</div>\n");
+	}
+
+	//IssueLog::Info('Search OQL: "'.$oFilter->ToOQL().'"');
 	$oDisplayBlock = new DisplayBlock($oFilter, 'list', false);
 
 	foreach($aListParams as $key => $value)
@@ -90,15 +98,12 @@ try
 			$aExtraParams['query_params'] = array('this' => $oObj);
 		}
 
-
 //        // Current extkey value, so we can display event if it is not available anymore (eg. archived).
 //        $iCurrentExtKeyId = (is_null($oObj)) ? 0 : $oObj->Get($this->sAttCode);
 //        $aExtraParams['current_extkey_id'] = $iCurrentExtKeyId;
 
 	}
 
-
-
 	$aExtraParams['display_limit'] = true;
 	$aExtraParams['truncated'] = true;
 	if (isset($sListId))
@@ -110,6 +115,7 @@ try
 		$oDisplayBlock->RenderContent($oPage, $aExtraParams);
 	}
 
+
 	$oPage->output();
 
 } catch (AjaxSearchException $e)
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 456317c25..e4ea15ed9 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -176,6 +176,12 @@ class SearchForm
 			$bOpen = $aExtraParams['open'];
 		}
 
+		$sDebug = utils::ReadParam('debug', 'false', false, 'parameter');
+		if ($sDebug == 'true')
+		{
+			$aListParams['debug'] = 'true';
+		}
+
 		$aDaysMin = array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
 			Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min'));
 		$aMonthsShort = array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'),