Allow return/cancel/notify url with query string to be set properly