Refactor filters management

Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
6 files changed