Added --number-queries and --number-targets