More work on filter/templating overhaul