Updates to reduce bias from throwing away events with close jets/photons in templates