Header and Filter swap only

Header and Filter swap only