Templates are now filtered by the `when` property properly