[jinja2 mode] Improve