Collapsible filters

added code form improvement #153