fix: Issue [#3403739]: De-duplicate code in twig templates