Reworking the query params