Fix filtering bugs

- enums work