Added querystring manipulation