Added filterSwitch (true/false) to  show/hide filters