Index: openacs-4/packages/general-comments/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/general-comments/www/index.xql	13 Jun 2018 13:40:24 -0000	1.3
+++ openacs-4/packages/general-comments/www/index.xql	13 Jun 2018 14:22:50 -0000	1.4
@@ -3,17 +3,15 @@
 
   <partialquery name="status_approved">      
     <querytext>
-
-      i.live_revision is not null
-
+      (i.live_revision is not null and
+         i.live_revision = r.revision_id)
     </querytext>
   </partialquery>
 
   <partialquery name="status_unapproved">      
     <querytext>
-
-      i.live_revision is null
-
+      (i.live_revision is null or
+         i.live_revision <> r.revision_id)
     </querytext>
   </partialquery>