Fix Fx filters

Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
8 files changed