Put options in standard order: --help first, then lexically.
  Rename --number-of-query to --number-of-queries.