Better handling of query params in stub requests