Better handling of outerjoined headers