[BC Break] Rebuild FieldFilter