diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Projections/CommentsFilter.cs b/src/Orchard.Web/Modules/Orchard.Comments/Projections/CommentsFilter.cs
index 9567f65be..243f901fe 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Projections/CommentsFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Projections/CommentsFilter.cs
@@ -28,8 +28,8 @@ namespace Orchard.Comments.Projections {
         }
 
         public void ApplyFilter(dynamic context) {
-            var query = (IContentQuery<ContentItem>)context.Query;
-            context.Query = query.Where<CommentsPartRecord>(x => x.CommentPartRecords.Any());
+            var query = (IHqlQuery)context.Query;
+            context.Query = query.Where(x => x.ContentPartRecord<CommentsPartRecord>(), x => x.IsNotEmpty("CommentPartRecords"));
         }
 
         public LocalizedString DisplayFilter(dynamic context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Projections/TagsFilter.cs b/src/Orchard.Web/Modules/Orchard.Tags/Projections/TagsFilter.cs
index d46336a82..d2a7ea6ac 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Projections/TagsFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Projections/TagsFilter.cs
@@ -34,8 +34,8 @@ namespace Orchard.Tags.Projections {
             string tags = Convert.ToString(context.State.TagIds);
             if (!String.IsNullOrEmpty(tags)) {
                 var ids = tags.Split(new[] { ',' }).Select(Int32.Parse).ToArray();
-                var query = (IContentQuery<ContentItem>)context.Query;
-                context.Query = query.Join<TagsPartRecord>().Where(x => x.Tags.Any(t => ids.Contains(t.TagRecord.Id)));
+                var query = (IHqlQuery)context.Query;
+                context.Query = query.Where(x => x.ContentPartRecord<TagsPartRecord>().Property("Tags", "tags"), x => x.In("TagRecord.Id", ids));
             }
         }