Updates to use an easier to manage query string format