AFMI-6896
Restructured the jinja filters.