Adding support for query as a url param