Index: branches/release-34/lib/MT/CMS/Search.pm
===================================================================
--- branches/release-34/lib/MT/CMS/Search.pm (revision 1823)
+++ branches/release-34/lib/MT/CMS/Search.pm (revision 1866)
@@ -412,9 +412,10 @@
         }
         if ( $class->has_column('junk_status') ) {
+            require MT::Comment;
             if ($is_junk) {
-                $terms{junk_status} = -1;
+                $terms{junk_status} = MT::Comment::JUNK();
             }
             else {
-                $terms{junk_status} = [ 0, 1 ];
+                $terms{junk_status} = MT::Comment::NOT_JUNK();
             }
         }
Index: branches/release-34/lib/MT/CMS/Blog.pm
===================================================================
--- branches/release-34/lib/MT/CMS/Blog.pm (revision 1823)
+++ branches/release-34/lib/MT/CMS/Blog.pm (revision 1866)
@@ -1777,5 +1777,5 @@
             ? $comment_count->{$blog_id}
             : $comment_count->{$blog_id} = MT::Comment->count(
-                { blog_id => $blog_id, junk_status => [ 0, 1 ] }
+                { blog_id => $blog_id, junk_status => MT::Comment::NOT_JUNK() }
             )
           )
@@ -1784,5 +1784,5 @@
             $ping_count ? $ping_count->{$blog_id} : $ping_count->{$blog_id} =
               MT::TBPing->count(
-                { blog_id => $blog_id, junk_status => [ 0, 1 ] }
+                { blog_id => $blog_id, junk_status => MT::TBPing::NOT_JUNK() }
               )
         ) || 0;
Index: branches/release-34/lib/MT/CMS/TrackBack.pm
===================================================================
--- branches/release-34/lib/MT/CMS/TrackBack.pm (revision 1823)
+++ branches/release-34/lib/MT/CMS/TrackBack.pm (revision 1866)
@@ -152,12 +152,13 @@
     ## entries.
     my %arg;
+    require MT::TBPing;
     if ( ( $app->param('tab') || '' ) eq 'junk' ) {
         $app->param( 'filter',     'junk_status' );
-        $app->param( 'filter_val', '-1' );
+        $app->param( 'filter_val', MT::TBPing::JUNK() );
         $param{filter_special} = 1;
         $param{filter_phrase}  = $app->translate('Junk TrackBacks');
     }
     else {
-        $terms{'junk_status'} = [ 0, 1 ];
+        $terms{'junk_status'} = MT::TBPing::NOT_JUNK();
     }
 
@@ -473,5 +474,4 @@
     elsif ( $status eq 'moderate' ) {
         $obj->moderate;
-        $obj->junk_status(0);
     }
     elsif ( $status eq 'junk' ) {
Index: branches/release-34/lib/MT/CMS/Comment.pm
===================================================================
--- branches/release-34/lib/MT/CMS/Comment.pm (revision 1823)
+++ branches/release-34/lib/MT/CMS/Comment.pm (revision 1866)
@@ -273,14 +273,14 @@
         if ( $filter_col eq 'status' ) {
             if ( $val eq 'approved' ) {
-                $terms{junk_status} = 1;
+                $terms{visible} = 1;
             }
             elsif ( $val eq 'pending' ) {
-                $terms{junk_status} = 0;
+                $terms{visible} = 0;
             }
             elsif ( $val eq 'junk' ) {
-                $terms{junk_status} = -1;
+                $terms{junk_status} = MT::Comment::JUNK();
             }
             else {
-                $terms{junk_status} = [ 0, 1 ];
+                $terms{junk_status} = MT::Comment::NOT_JUNK();
             }
         }
@@ -934,5 +934,6 @@
     my $class = $app->model($type);
     my $arg   = {};
-    $arg->{junk_status} = -1;
+    require MT::Comment;
+    $arg->{junk_status} = MT::Comment::JUNK();
     $arg->{blog_id} = $blog_id if $blog_id;
     $class->remove($arg);
@@ -1446,5 +1447,4 @@
     elsif ( $status eq 'moderate' ) {
         $obj->moderate;
-        $obj->junk_status(0);
     }
     elsif ( $status eq 'junk' ) {