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

Fixes #138

B3P-138