diff --git a/upload/includes/classes/groups.class.php b/upload/includes/classes/groups.class.php
index 85dde4f6..0b770682 100644
--- a/upload/includes/classes/groups.class.php
+++ b/upload/includes/classes/groups.class.php
@@ -1741,11 +1741,11 @@ class CBGroups extends CBCategory
 		
 		$cond = "";
 		if(!has_access('admin_access',TRUE) && !$force_admin)
-			$cond .= " groups.active='yes' ";
+			$cond .= " ".tbl("groups.active")."='yes' ";
 		else
 		{
 			if($params['active'])
-				$cond .= " groups.active='".$params['active']."'";
+				$cond .= " ".tbl("groups.active")."='".$params['active']."'";
 		}
 		
 		//Setting Category Condition
diff --git a/upload/includes/classes/video.class.php b/upload/includes/classes/video.class.php
index 0152ddd9..88c4a13b 100644
--- a/upload/includes/classes/video.class.php
+++ b/upload/includes/classes/video.class.php
@@ -383,17 +383,17 @@ class CBvideo extends CBCategory
 		
 		$cond = "";
 		if(!has_access('admin_access',TRUE))
-			$cond .= " video.status='Successful' AND video.active='yes' ";
+			$cond .= " ".tbl("video.status")."='Successful' AND ".tbl("video.active")."='yes' ";
 		else
 		{
 			if($params['active'])
-				$cond .= " video.active='".$params['active']."'";
+				$cond .= " ".tbl("video.active")."='".$params['active']."'";
 
 			if($params['status'])
 			{
 				if($cond!='')
 					$cond .=" AND ";
-				$cond .= " video.status='".$params['status']."'";
+				$cond .= " ".tbl("video.status")."='".$params['status']."'";
 			}
 			
 			
@@ -505,12 +505,14 @@ class CBvideo extends CBCategory
 			$cond .= " video.videoid <> '".$params['exclude']."' ";
 		}
 		
+		
 		if(!$params['count_only'])
 		{
 			if(!empty($cond))
 				$cond .= " AND ";
 			$result = $db->select(tbl('video,users'),tbl('video.*,users.userid,users.username'),$cond." ".tbl("video.userid")." = ".tbl("users.userid"),$limit,$order);	
 		}
+
 		if($params['count_only'])
 			return $result = $db->count(tbl('video'),'*',$cond);
 		if($params['assign'])