Add switch filters

Change-Id: I1679d7e581dcea10eb05e42028bdf7f7979532c9
Merge "Add switch filters"