Add querystring and body check