Filter count + tweaks