Fix missing variable set
Fix refactoring
Show class in report form