chore: use with_xxx flag instead of sending another request