Minor filtering tweaks.