Made the filters more comprehensive
Bug fixes
Formatting improvements