Added check for ?envelop=false and corresponding test