Restructure filter code; Support adding multiple filters; BUG: filters disappear wen adding OR filter on root