fixed logic to have all nonApi headers pull in apiHeader if present