Fix so FilterMixin can handle undefined
Merge branch 'master' into Tooltip