Update how query params and data are handled