Updated to manual templatefilter loading