Add ability to parse query string