Fix so FilterMixin can handle undefined