#2 - the comments query and block were added.