Prevent CommentQuery from doing nonsense Joins, may break some views