Added the catch for the template tags