Improve standard filter toggles
Enhance survey filter toggles
Enhance filter ui
Fix merging conflicts