Add filters enabled, filter error checking
Fix filter filtering