ignore some unnecessary fields and refact switch filter code

Change-Id: I75313f3d53f512334496b096fac042019eccd670
Merge "ignore some unnecessary fields and refact switch filter code" into dev/experimental