refactored how we manage query string params