Changes to Comment query