Header: Changed the way the header filters are organized