OptionalStringQuery -> OptStringQuery