Add ability to split off query string params