final tweak. I'll also need to fork this filter later