Did a small cleanup of template by pre-filtering