couple tweaks
another filter refactoring