diff --git a/db/schema.rb b/db/schema.rb
index d195765..a2bfca6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -289,8 +289,12 @@ ActiveRecord::Schema.define(version: 20160422163123) do
     t.string   "user_agent"
     t.string   "referrer"
     t.text     "settings"
+    t.integer  "paragraph_id"
+    t.string   "paragraph_uuid"
+    t.integer  "group_id"
   end
 
+  add_index "comments", ["paragraph_uuid"], name: "index_comments_on_paragraph_uuid", using: :btree
   add_index "comments", ["source_id", "spam"], name: "index_comments_on_source_id_and_spam", using: :btree
 
   create_table "contact_lists", force: :cascade do |t|
diff --git a/plugins/comment_group/lib/ext/article.rb b/plugins/comment_group/lib/ext/article.rb
index 6fee4e5..6ea986b 100644
--- a/plugins/comment_group/lib/ext/article.rb
+++ b/plugins/comment_group/lib/ext/article.rb
@@ -3,7 +3,7 @@ require_dependency 'article'
 class Article
 
   has_many :group_comments, -> {
-    order('created_at asc').where('group_id IS NOT NULL')
+    order('created_at asc').where('comments.group_id IS NOT NULL')
   }, class_name: 'Comment', foreign_key: 'source_id', dependent: :destroy
 
   validate :not_empty_group_comments_removed
--
libgit2 0.21.2