Fixed usage of URI and query params