diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index ed0b13c9..3e7b4df5 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -56,13 +56,13 @@ class CommentAdmin extends LeftAndMain {
 		$section = $this->Section();
 
 		if($section == 'approved') {
-			$filter = "\"IsSpam\"=0 AND \"NeedsModeration\"=0";
+			$filter = "\"IsSpam\" = 0 AND \"NeedsModeration\" = 0";
 			$title = "<h2>". _t('CommentAdmin.APPROVEDCOMMENTS', 'Approved Comments')."</h2>";
 		} else if($section == 'unmoderated') {
-			$filter = '"NeedsModeration"';
+			$filter = '"NeedsModeration" = 1';
 			$title = "<h2>"._t('CommentAdmin.COMMENTSAWAITINGMODERATION', 'Comments Awaiting Moderation')."</h2>";
 		} else {
-			$filter = '"IsSpam"';
+			$filter = '"IsSpam" = 1';
 			$title = "<h2>"._t('CommentAdmin.SPAM', 'Spam')."</h2>";
 		}
 
@@ -147,7 +147,7 @@ JS;
 
 	function deleteall() {
 		$numComments = 0;
-		$spam = DataObject::get('PageComment', '"PageComment"."IsSpam"');
+		$spam = DataObject::get('PageComment', '"PageComment"."IsSpam" = 1');
 
 		if($spam) {
 			$numComments = $spam->Count();
diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
index bfe2524c..907ea432 100755
--- a/code/sitefeatures/PageComment.php
+++ b/code/sitefeatures/PageComment.php
@@ -166,7 +166,7 @@ class PageComment extends DataObject {
 class PageComment_Controller extends Controller {
 	function rss() {
 		$parentcheck = isset($_REQUEST['pageid']) ? "\"ParentID\" = " . (int) $_REQUEST['pageid'] : "\"ParentID\" > 0";
-		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND NOT \"NeedsModeration\"";
+		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\" = 0";
 		$comments = DataObject::get("PageComment", "$parentcheck AND \"IsSpam\" = 0 $unmoderatedfilter", "\"Created\" DESC", "", 10);
 		if(!isset($comments)) {
 			$comments = new DataObjectSet();
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index a8602a6e..c34d82bc 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -210,8 +210,8 @@ class PageCommentInterface extends RequestHandler {
 		$limit['start'] = isset($_GET['commentStart']) ? (int)$_GET['commentStart'] : 0;
 		$limit['limit'] = PageComment::$comments_per_page;
 		
-		$spamfilter = isset($_GET['showspam']) ? '' : "AND \"IsSpam\"=0";
-		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\"=0";
+		$spamfilter = isset($_GET['showspam']) ? '' : "AND \"IsSpam\" = 0";
+		$unmoderatedfilter = Permission::check('ADMIN') ? '' : "AND \"NeedsModeration\" = 0";
 		$comments =  DataObject::get("PageComment", "\"ParentID\" = '" . Convert::raw2sql($this->page->ID) . "' $spamfilter $unmoderatedfilter", '"Created" DESC', "", $limit);
 		
 		if(is_null($comments)) {