diff --git a/web/includes/functions.php b/web/includes/functions.php
index 7223a7380..cbde4ff33 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -1378,7 +1378,7 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&' )
             if ( isset($filter['terms'][$i]['cnj']) )
             {
                 $filter['query'] .= $querySep."filter[terms][$i][cnj]=".urlencode($filter['terms'][$i]['cnj']);
-                $filter['sql'] .= " ".dbEscape($filter['terms'][$i]['cnj'])." ";
+                $filter['sql'] .= " ".$filter['terms'][$i]['cnj']." ";
                 $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cnj]\" value=\"".htmlspecialchars($filter['terms'][$i]['cnj'])."\"/>\n";
             }
             if ( isset($filter['terms'][$i]['obr']) )
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index 5959bdc6f..6e86e58af 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -33,8 +33,9 @@ $countSql = "select count(E.Id) as EventCount from Monitors as M inner join Even
 $eventsSql = "select E.Id,E.MonitorId,M.Name As MonitorName,M.DefaultScale,E.Name,E.Width,E.Height,E.Cause,E.Notes,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
 if ( $user['MonitorIds'] )
 {
-    $countSql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-    $eventsSql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
+	$user_monitor_ids = " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
+    $countSql .= $user_monitor_ids;
+    $eventsSql .= $user_monitor_ids;
 }
 else
 {
@@ -94,7 +95,7 @@ if ( !empty($page) )
 }
 elseif ( !empty( $limit ) )
 {
-    $eventsSql .= " limit 0, ".dbEscape($limit);
+    $eventsSql .= " limit 0, $limit";
 }
 
 $maxWidth = 0;