Added templates EVERYWHERE and security with filters