Added filter and templates