WIP: Change query string format, using custom Request class