Fixed typo, and allow block argument to Query