Implemented --number-queries