Bug fix for comments' query.