Refactored saving of report variables in session