Removing Filter Facade
Making EpiController more flexible