Removed en/dis swither; Fixed access to variables from middleware