Cleanups. Add 'applytemplate' filter.