fix twig template issues