[BUGFIX] Make subheaders aware of possible default header layouts