diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index f9d4484a7..539117970 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -751,7 +751,7 @@ class DisplayBlock
 			$sClass = $this->m_oFilter->GetClass();
 			$oAppContext = new ApplicationContext();
 			$bContextFilter = isset($aExtraParams['context_filter']) ? isset($aExtraParams['context_filter']) != 0 : false;
-			if ($bContextFilter)
+			if ($bContextFilter && is_null($this->m_oSet))
 			{
 				foreach($oAppContext->GetNames() as $sFilterCode)
 				{
diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php
index ebabf9026..4d2fa2c9f 100644
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -246,10 +246,12 @@ abstract class DBSearch
 	 */
 	abstract public function ApplyParameters($aArgs);
 
-    public function serialize($bDevelopParams = false, $aContextParams = null)
+    public function serialize($bDevelopParams = false, $aContextParams = array())
 	{
 		$aQueryParams = $this->GetQueryParams();
 
+		$aContextParams = array_merge($this->GetInternalParams(), $aContextParams);
+
 		foreach($aQueryParams as $sParam => $sValue)
 		{
 			if (isset($aContextParams[$sParam]))