Updated email container, new column fix added