Refactoring query params