Moving extra header logic to twig