Bug fixes twig filters