Template migration and filter fix for Egamma

Template migration and filter fix for Egamma