added query string option