Fix: URIs did not include query params