Teacher + Class update

- Added support for multiple locations in teacher
- Updated class module
- add more filter options