Improve standard filter toggles