[ticket/138] Fix issues caused by switching to twig

B3P-138
Merge pull request #139 from marc1706/ticket/138

[ticket/138] Fix issues caused by switching to twig