include fix in querystring and improve tests