Refactor FiltersManager

Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
13 files changed