#4 - updated all the filters, cleaned up dynamic usage, fixed issues and added missing classes