Rename NoneFilter to EmptyFilter