query params refactor