Revamped the Filter system. Simplified and handles filtering more elegantly.